diff options
| -rw-r--r-- | ChangeLog | 31 | ||||
| -rw-r--r-- | crypt/crypt.c | 10 | ||||
| -rw-r--r-- | crypt/crypt_util.c | 10 | ||||
| -rw-r--r-- | inet/inet_mkadr.c | 3 | ||||
| -rw-r--r-- | inet/rcmd.c | 66 | ||||
| -rw-r--r-- | inet/rexec.c | 15 | ||||
| -rw-r--r-- | inet/ruserpass.c | 3 | ||||
| -rw-r--r-- | locale/programs/xmalloc.c | 3 | ||||
| -rw-r--r-- | manual/examples/timeval_subtract.c | 3 | ||||
| -rw-r--r-- | math/w_drem.c | 3 | ||||
| -rw-r--r-- | math/w_dremf.c | 3 | ||||
| -rw-r--r-- | math/w_dreml.c | 3 | ||||
| -rw-r--r-- | misc/daemon.c | 3 | ||||
| -rw-r--r-- | resolv/res_debug.c | 7 | ||||
| -rw-r--r-- | stdlib/div.c | 3 | ||||
| -rw-r--r-- | string/memcmp.c | 3 | ||||
| -rw-r--r-- | sunrpc/pmap_rmt.c | 10 | ||||
| -rw-r--r-- | sunrpc/svc_udp.c | 4 |
18 files changed, 78 insertions, 105 deletions
@@ -1,5 +1,36 @@ 2015-10-20 Joseph Myers <joseph@codesourcery.com> + * 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. + * crypt/cert.c (main): Convert to prototype-style function definition. * io/pipe.c (__pipe): Likewise. diff --git a/crypt/crypt.c b/crypt/crypt.c index c63ea93562..60f53fbccc 100644 --- a/crypt/crypt.c +++ b/crypt/crypt.c @@ -34,9 +34,8 @@ #define SBA(sb, v) (*(long32*)((char*)(sb)+(v))) void -_ufc_doit_r(itr, __data, res) - ufc_long itr, *res; - struct crypt_data * __restrict __data; +_ufc_doit_r (ufc_long itr, struct crypt_data * __restrict __data, + ufc_long *res) { int i; long32 s, *k; @@ -80,9 +79,8 @@ _ufc_doit_r(itr, __data, res) #define SBA(sb, v) (*(long64*)((char*)(sb)+(v))) void -_ufc_doit_r(itr, __data, res) - ufc_long itr, *res; - struct crypt_data * __restrict __data; +_ufc_doit_r (ufc_long itr, struct crypt_data * __restrict __data, + ufc_long *res) { int i; long64 l, r, s, *k; diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c index f78861cf18..05f6a56257 100644 --- a/crypt/crypt_util.c +++ b/crypt/crypt_util.c @@ -304,9 +304,7 @@ _ufc_clearmem (char *start, int cnt) } void -_ufc_copymem(from, to, cnt) - char *from, *to; - int cnt; +_ufc_copymem (char *from, char *to, int cnt) { while(cnt--) *to++ = *from++; @@ -762,10 +760,8 @@ _ufc_dofinalperm_r (ufc_long *res, struct crypt_data * __restrict __data) */ void -_ufc_output_conversion_r(v1, v2, salt, __data) - ufc_long v1, v2; - const char *salt; - struct crypt_data * __restrict __data; +_ufc_output_conversion_r (ufc_long v1, ufc_long v2, const char *salt, + struct crypt_data * __restrict __data) { int i, s, shf; 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; diff --git a/locale/programs/xmalloc.c b/locale/programs/xmalloc.c index 2528c5f379..cca129b2de 100644 --- a/locale/programs/xmalloc.c +++ b/locale/programs/xmalloc.c @@ -80,8 +80,7 @@ xmalloc (size_t n) /* Allocate memory for N elements of S bytes, with error checking. */ VOID * -xcalloc (n, s) - size_t n, s; +xcalloc (size_t n, size_t s) { VOID *p; diff --git a/manual/examples/timeval_subtract.c b/manual/examples/timeval_subtract.c index 8bf8c4c432..f2ca593936 100644 --- a/manual/examples/timeval_subtract.c +++ b/manual/examples/timeval_subtract.c @@ -20,8 +20,7 @@ Return 1 if the difference is negative, otherwise 0. */ int -timeval_subtract (result, x, y) - struct timeval *result, *x, *y; +timeval_subtract (struct timeval *result, struct timeval *x, struct timeval *y) { /* Perform the carry for the later subtraction by updating @var{y}. */ if (x->tv_usec < y->tv_usec) { diff --git a/math/w_drem.c b/math/w_drem.c index 9e2b1e7472..843b67aa80 100644 --- a/math/w_drem.c +++ b/math/w_drem.c @@ -8,8 +8,7 @@ #include <math.h> double -__drem(x, y) - double x, y; +__drem (double x, double y) { return __remainder(x, y); } diff --git a/math/w_dremf.c b/math/w_dremf.c index 0e25ef8ccf..c5e7c63af5 100644 --- a/math/w_dremf.c +++ b/math/w_dremf.c @@ -9,8 +9,7 @@ #include <math_private.h> float -__dremf(x, y) - float x, y; +__dremf (float x, float y) { return __remainderf(x, y); } diff --git a/math/w_dreml.c b/math/w_dreml.c index aa73eedc49..8d0139ac28 100644 --- a/math/w_dreml.c +++ b/math/w_dreml.c @@ -10,8 +10,7 @@ #include <math.h> long double -__dreml(x, y) - long double x, y; +__dreml (long double x, long double y) { return __remainderl(x, y); } diff --git a/misc/daemon.c b/misc/daemon.c index 7597ce9996..9d186b24bd 100644 --- a/misc/daemon.c +++ b/misc/daemon.c @@ -41,8 +41,7 @@ static char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93"; #include <not-cancel.h> int -daemon(nochdir, noclose) - int nochdir, noclose; +daemon (int nochdir, int noclose) { int fd; diff --git a/resolv/res_debug.c b/resolv/res_debug.c index 6e76ea3816..68a407a033 100644 --- a/resolv/res_debug.c +++ b/resolv/res_debug.c @@ -307,11 +307,8 @@ p_cdname(const u_char *cp, const u_char *msg, FILE *file) { length supplied). */ const u_char * -p_fqnname(cp, msg, msglen, name, namelen) - const u_char *cp, *msg; - int msglen; - char *name; - int namelen; +p_fqnname (const u_char *cp, const u_char *msg, int msglen, char *name, + int namelen) { int n, newlen; diff --git a/stdlib/div.c b/stdlib/div.c index f0c6da2f21..5ce4a496cf 100644 --- a/stdlib/div.c +++ b/stdlib/div.c @@ -51,8 +51,7 @@ /* Return the `div_t' representation of NUMER over DENOM. */ div_t -div (numer, denom) - int numer, denom; +div (int numer, int denom) { div_t result; diff --git a/string/memcmp.c b/string/memcmp.c index 429c9c838d..9d7e25fd79 100644 --- a/string/memcmp.c +++ b/string/memcmp.c @@ -93,8 +93,7 @@ typedef unsigned char byte; static int memcmp_bytes (op_t, op_t) __THROW; static int -memcmp_bytes (a, b) - op_t a, b; +memcmp_bytes (op_t a, op_t b) { long int srcp1 = (long int) &a; long int srcp2 = (long int) &b; diff --git a/sunrpc/pmap_rmt.c b/sunrpc/pmap_rmt.c index c0adc5b49a..c8a8011ea5 100644 --- a/sunrpc/pmap_rmt.c +++ b/sunrpc/pmap_rmt.c @@ -64,13 +64,9 @@ static const struct timeval timeout = {3, 0}; * programs to do a lookup and call in one step. */ enum clnt_stat -pmap_rmtcall (addr, prog, vers, proc, xdrargs, argsp, xdrres, resp, tout, port_ptr) - struct sockaddr_in *addr; - u_long prog, vers, proc; - xdrproc_t xdrargs, xdrres; - caddr_t argsp, resp; - struct timeval tout; - u_long *port_ptr; +pmap_rmtcall (struct sockaddr_in *addr, u_long prog, u_long vers, u_long proc, + xdrproc_t xdrargs, caddr_t argsp, xdrproc_t xdrres, caddr_t resp, + struct timeval tout, u_long *port_ptr) { int socket = -1; CLIENT *client; diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c index 956a1e9cec..0e893c1929 100644 --- a/sunrpc/svc_udp.c +++ b/sunrpc/svc_udp.c @@ -118,9 +118,7 @@ struct svcudp_data * The routines returns NULL if a problem occurred. */ SVCXPRT * -svcudp_bufcreate (sock, sendsz, recvsz) - int sock; - u_int sendsz, recvsz; +svcudp_bufcreate (int sock, u_int sendsz, u_int recvsz) { bool_t madesock = FALSE; SVCXPRT *xprt; |