From 41075ae3e7f406e67d51da8cc5e89e397710d54b Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Tue, 20 Oct 2015 11:52:27 +0000 Subject: 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. --- locale/programs/xmalloc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'locale') 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; -- cgit v1.2.3