diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-10-20 11:52:27 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-10-20 11:52:27 +0000 |
| commit | 41075ae3e7f406e67d51da8cc5e89e397710d54b (patch) | |
| tree | d926b4a29e019eba76fa3b4f269214f19db66731 /crypt | |
| parent | a72ddc1424d5bfcab14d90f1149cbb9b492f0120 (diff) | |
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.
Diffstat (limited to 'crypt')
| -rw-r--r-- | crypt/crypt.c | 10 | ||||
| -rw-r--r-- | crypt/crypt_util.c | 10 |
2 files changed, 7 insertions, 13 deletions
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; |