Convert 29 more function definitions to prototype style (multiple parameters in one K&R parameter declaration).

This automatically-generated patch converts 29 function definitions in
glibc (including one in an example in the manual) from old-style K&R
to prototype-style.  Following my other recent such patches, this one
deals with the case of function definitions where one K&R parameter
declaration declares multiple parameters, as in:

void
foo (a, b)
     int a, *b;
{
}

Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch).

	* crypt/crypt.c (_ufc_doit_r): Convert to prototype-style function
	definition.
	(_ufc_doit_r): Likewise.
	* crypt/crypt_util.c (_ufc_copymem): Likewise.
	(_ufc_output_conversion_r): Likewise.
	* inet/inet_mkadr.c (__inet_makeaddr): Likewise.
	* inet/rcmd.c (rcmd_af): Likewise.
	(rcmd): Likewise.
	(ruserok_af): Likewise.
	(ruserok): Likewise.
	(ruserok2_sa): Likewise.
	(ruserok_sa): Likewise.
	(iruserok_af): Likewise.
	(iruserok): Likewise.
	(__ivaliduser): Likewise.
	(__validuser2_sa): Likewise.
	* inet/rexec.c (rexec_af): Likewise.
	(rexec): Likewise.
	* inet/ruserpass.c (ruserpass): Likewise.
	* locale/programs/xmalloc.c (xcalloc): Likewise.
	* manual/examples/timeval_subtract.c (timeval_subtract): Likewise.
	* math/w_drem.c (__drem): Likewise.
	* math/w_dremf.c (__dremf): Likewise.
	* math/w_dreml.c (__dreml): Likewise.
	* misc/daemon.c (daemon): Likewise.
	* resolv/res_debug.c (p_fqnname): Likewise.
	* stdlib/div.c (div): Likewise.
	* string/memcmp.c (memcmp_bytes): Likewise.
	* sunrpc/pmap_rmt.c (pmap_rmtcall): Likewise.
	* sunrpc/svc_udp.c (svcudp_bufcreate): Likewise.

4 files changed, 26 insertions, 61 deletions

diff --git a/inet/inet_mkadr.c b/inet/inet_mkadr.c
index 580a9cd956..75d8daa654 100644
--- a/inet/inet_mkadr.c
+++ b/inet/inet_mkadr.c
@@ -40,8 +40,7 @@ static char sccsid[] = "@(#)inet_makeaddr.c	8.1 (Berkeley) 6/4/93";
  * building addresses stored in the ifnet structure.
  */
 struct in_addr
-__inet_makeaddr(net, host)
-	in_addr_t net, host;
+__inet_makeaddr (in_addr_t net, in_addr_t host)
 {
 	struct in_addr in;
 
diff --git a/inet/rcmd.c b/inet/rcmd.c
index d3fe3c57fc..ace6b14a93 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -103,12 +103,8 @@ libc_hidden_proto (iruserok_af)
 libc_freeres_ptr(static char *ahostbuf);
 
 int
-rcmd_af(ahost, rport, locuser, remuser, cmd, fd2p, af)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
-	sa_family_t af;
+rcmd_af (char **ahost, u_short rport, const char *locuser, const char *remuser,
+	 const char *cmd, int *fd2p, sa_family_t af)
 {
 	char paddr[INET6_ADDRSTRLEN];
 	struct addrinfo hints, *res, *ai;
@@ -360,11 +356,8 @@ bad:
 libc_hidden_def (rcmd_af)
 
 int
-rcmd(ahost, rport, locuser, remuser, cmd, fd2p)
-	char **ahost;
-	u_short rport;
-	const char *locuser, *remuser, *cmd;
-	int *fd2p;
+rcmd (char **ahost, u_short rport, const char *locuser, const char *remuser,
+      const char *cmd, int *fd2p)
 {
   return rcmd_af (ahost, rport, locuser, remuser, cmd, fd2p, AF_INET);
 }
@@ -438,10 +431,8 @@ int	__check_rhosts_file = 1;
 char	*__rcmd_errstr;
 
 int
-ruserok_af(rhost, superuser, ruser, luser, af)
-	const char *rhost, *ruser, *luser;
-	int superuser;
-	sa_family_t af;
+ruserok_af (const char *rhost, int superuser, const char *ruser,
+	    const char *luser, sa_family_t af)
 {
 	struct addrinfo hints, *res, *res0;
 	int gai;
@@ -465,9 +456,8 @@ ruserok_af(rhost, superuser, ruser, luser, af)
 libc_hidden_def (ruserok_af)
 
 int
-ruserok(rhost, superuser, ruser, luser)
-	const char *rhost, *ruser, *luser;
-	int superuser;
+ruserok (const char *rhost, int superuser, const char *ruser,
+	 const char *luser)
 {
 	return ruserok_af(rhost, superuser, ruser, luser, AF_INET);
 }
@@ -527,11 +517,8 @@ iruserfopen (const char *file, uid_t okuser)
  * Returns 0 if ok, -1 if not ok.
  */
 static int
-ruserok2_sa (ra, ralen, superuser, ruser, luser, rhost)
-     struct sockaddr *ra;
-     size_t ralen;
-     int superuser;
-     const char *ruser, *luser, *rhost;
+ruserok2_sa (struct sockaddr *ra, size_t ralen, int superuser,
+	     const char *ruser, const char *luser, const char *rhost)
 {
   FILE *hostf = NULL;
   int isbad = -1;
@@ -588,22 +575,17 @@ ruserok2_sa (ra, ralen, superuser, ruser, luser, rhost)
  * ruserok_sa() is now discussed on ipng, so
  * currently disabled for external use
  */
-static int ruserok_sa(ra, ralen, superuser, ruser, luser)
-     struct sockaddr *ra;
-     size_t ralen;
-     int superuser;
-     const char *ruser, *luser;
+static int
+ruserok_sa (struct sockaddr *ra, size_t ralen, int superuser,
+	    const char *ruser, const char *luser)
 {
   return ruserok2_sa(ra, ralen, superuser, ruser, luser, "-");
 }
 
 /* This is the exported version.  */
 int
-iruserok_af (raddr, superuser, ruser, luser, af)
-     const void *raddr;
-     int superuser;
-     const char *ruser, *luser;
-     sa_family_t af;
+iruserok_af (const void *raddr, int superuser, const char *ruser,
+	     const char *luser, sa_family_t af)
 {
   union {
     struct sockaddr generic;
@@ -632,10 +614,7 @@ iruserok_af (raddr, superuser, ruser, luser, af)
 libc_hidden_def (iruserok_af)
 
 int
-iruserok (raddr, superuser, ruser, luser)
-     u_int32_t raddr;
-     int superuser;
-     const char *ruser, *luser;
+iruserok (u_int32_t raddr, int superuser, const char *ruser, const char *luser)
 {
   return iruserok_af (&raddr, superuser, ruser, luser, AF_INET);
 }
@@ -652,10 +631,8 @@ iruserok (raddr, superuser, ruser, luser)
  * Returns 0 if ok, -1 if not ok.
  */
 int
-__ivaliduser(hostf, raddr, luser, ruser)
-	FILE *hostf;
-	u_int32_t raddr;
-	const char *luser, *ruser;
+__ivaliduser (FILE *hostf, u_int32_t raddr, const char *luser,
+	      const char *ruser)
 {
 	struct sockaddr_in ra;
 	memset(&ra, '\0', sizeof(ra));
@@ -766,11 +743,8 @@ __isempty (char *p)
  * Returns 0 if positive match, -1 if _not_ ok.
  */
 static int
-__validuser2_sa(hostf, ra, ralen, luser, ruser, rhost)
-	FILE *hostf;
-	struct sockaddr *ra;
-	size_t ralen;
-	const char *luser, *ruser, *rhost;
+__validuser2_sa (FILE *hostf, struct sockaddr *ra, size_t ralen,
+		 const char *luser, const char *ruser, const char *rhost)
 {
     const char *user;
     char *p;
diff --git a/inet/rexec.c b/inet/rexec.c
index 75bb47082b..4e6d48d6b8 100644
--- a/inet/rexec.c
+++ b/inet/rexec.c
@@ -49,12 +49,8 @@ int	rexecoptions;
 libc_freeres_ptr (static char *ahostbuf);
 
 int
-rexec_af(ahost, rport, name, pass, cmd, fd2p, af)
-	char **ahost;
-	int rport;
-	const char *name, *pass, *cmd;
-	int *fd2p;
-	sa_family_t af;
+rexec_af (char **ahost, int rport, const char *name, const char *pass,
+	  const char *cmd, int *fd2p, sa_family_t af)
 {
 	struct sockaddr_storage from;
 	struct addrinfo hints, *res0;
@@ -198,11 +194,8 @@ bad:
 libc_hidden_def (rexec_af)
 
 int
-rexec(ahost, rport, name, pass, cmd, fd2p)
-	char **ahost;
-	int rport;
-	const char *name, *pass, *cmd;
-	int *fd2p;
+rexec (char **ahost, int rport, const char *name, const char *pass,
+       const char *cmd, int *fd2p)
 {
 	return rexec_af(ahost, rport, name, pass, cmd, fd2p, AF_INET);
 }
diff --git a/inet/ruserpass.c b/inet/ruserpass.c
index 2669a885b0..ff379db43b 100644
--- a/inet/ruserpass.c
+++ b/inet/ruserpass.c
@@ -94,8 +94,7 @@ static const struct toktab {
 
 
 int
-ruserpass(host, aname, apass)
-	const char *host, **aname, **apass;
+ruserpass (const char *host, const char **aname, const char **apass)
 {
 	char *hdir, *buf, *tmp;
 	char myname[1024], *mydomain;