From f63f2bfdfaad591305863a79c4fd2c3f50015f26 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 19 Oct 2015 21:23:47 +0000 Subject: Convert 69 more function definitions to prototype style (line wrap cases). This automatically-generated patch converts 69 function definitions in glibc from old-style K&R to prototype-style. This patch, covering both sysdeps and non-sysdeps files, deals with cases where the prototype needed to be wrapped over more than one line. Otherwise, exclusions and caveats are as for and . Tested for x86_64 and x86 (testsuite, and that installed stripped shared libraries are unchanged by the patch). * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style function definition. * crypt/crypt_util.c (__encrypt_r): Likewise. * libio/genops.c (_IO_no_init): Likewise. * libio/iofopncook.c (_IO_fopencookie): Likewise. (_IO_old_fopencookie): Likewise. * libio/iofwrite_u.c (fwrite_unlocked): Likewise. * libio/iogetline.c (_IO_getline): Likewise. (_IO_getline_info): Likewise. * libio/iogetwline.c (_IO_getwline): Likewise. (_IO_getwline_info): Likewise. * libio/vsnprintf.c (_IO_vsnprintf): Likewise. * libio/vswprintf.c (_IO_vswprintf): Likewise. * locale/programs/simple-hash.c (insert_entry_2): Likewise. (find_entry): Likewise. (iterate_table): Likewise. (lookup): Likewise. * login/forkpty.c (forkpty): Likewise. * misc/hsearch_r.c (__hsearch_r): Likewise. * misc/select.c (__select): Likewise. * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore): Likewise. * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0): Likewise. * nptl/old_pthread_cond_timedwait.c (__pthread_cond_timedwait_2_0): Likewise. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_getpshared.c (pthread_barrierattr_getpshared): Likewise. * nptl/pthread_getschedparam.c (__pthread_getschedparam): Likewise. * nptl/pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Likewise. * nptl/pthread_mutexattr_getprioceiling.c (pthread_mutexattr_getprioceiling): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock): Likewise. * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock): Likewise. * nptl/pthread_setschedparam.c (__pthread_setschedparam): Likewise. * socket/recvfrom.c (__recvfrom): Likewise. * socket/sendto.c (__sendto): Likewise. * socket/setsockopt.c (__setsockopt): Likewise. * stdio-common/_itoa.c (_itoa): Likewise. * stdio-common/_itowa.c (_itowa): Likewise. * stdio-common/reg-printf.c (__register_printf_specifier): Likewise. (__register_printf_function): Likewise. * stdio-common/tempname.c (__path_search): Likewise. * stdlib/addmul_1.c (mpn_addmul_1): Likewise. * stdlib/mul_1.c (mpn_mul_1): Likewise. * stdlib/random_r.c (__initstate_r): Likewise. * stdlib/setenv.c (__add_to_environ): Likewise. * stdlib/submul_1.c (mpn_submul_1): Likewise. * streams/getpmsg.c (getpmsg): Likewise. * streams/putmsg.c (putmsg): Likewise. * streams/putpmsg.c (putpmsg): Likewise. * sunrpc/clnt_raw.c (clntraw_call): Likewise. * sunrpc/clnt_tcp.c (clnttcp_call): Likewise. * sunrpc/clnt_udp.c (clntudp_create): Likewise. * sunrpc/clnt_unix.c (clntunix_call): Likewise. * sunrpc/pm_getport.c (pmap_getport): Likewise. * sunrpc/svc_udp.c (cache_get): Likewise. * sunrpc/xdr_array.c (xdr_vector): Likewise. * sysdeps/mach/hurd/getcwd.c (__canonicalize_directory_name_internal): Likewise. * sysdeps/mach/hurd/pselect.c (__pselect): Likewise. * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise. * sysdeps/mach/hurd/select.c (__select): Likewise. * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise. * sysdeps/pthread/timer_settime.c (timer_settime): Likewise. * sysdeps/sparc/nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise. * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise. * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime): Likewise. * sysvipc/semtimedop.c (semtimedop): Likewise. * time/setitimer.c (__setitimer): Likewise. * time/strftime_l.c (emacs_strftime): Likewise. --- stdlib/addmul_1.c | 7 ++----- stdlib/mul_1.c | 7 ++----- stdlib/random_r.c | 7 ++----- stdlib/setenv.c | 7 ++----- stdlib/submul_1.c | 7 ++----- 5 files changed, 10 insertions(+), 25 deletions(-) (limited to 'stdlib') diff --git a/stdlib/addmul_1.c b/stdlib/addmul_1.c index 47b9db3db0..b1e8731236 100644 --- a/stdlib/addmul_1.c +++ b/stdlib/addmul_1.c @@ -26,11 +26,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see #include "longlong.h" mp_limb_t -mpn_addmul_1 (res_ptr, s1_ptr, s1_size, s2_limb) - register mp_ptr res_ptr; - register mp_srcptr s1_ptr; - mp_size_t s1_size; - register mp_limb_t s2_limb; +mpn_addmul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr, + mp_size_t s1_size, register mp_limb_t s2_limb) { register mp_limb_t cy_limb; register mp_size_t j; diff --git a/stdlib/mul_1.c b/stdlib/mul_1.c index f31acc1379..b5c7758c8b 100644 --- a/stdlib/mul_1.c +++ b/stdlib/mul_1.c @@ -24,11 +24,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see #include "longlong.h" mp_limb_t -mpn_mul_1 (res_ptr, s1_ptr, s1_size, s2_limb) - register mp_ptr res_ptr; - register mp_srcptr s1_ptr; - mp_size_t s1_size; - register mp_limb_t s2_limb; +mpn_mul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr, + mp_size_t s1_size, register mp_limb_t s2_limb) { register mp_limb_t cy_limb; register mp_size_t j; diff --git a/stdlib/random_r.c b/stdlib/random_r.c index 059f7af985..6beb8c4ba5 100644 --- a/stdlib/random_r.c +++ b/stdlib/random_r.c @@ -227,11 +227,8 @@ weak_alias (__srandom_r, srandom_r) setstate so that it doesn't matter when initstate is called. Returns 0 on success, non-zero on failure. */ int -__initstate_r (seed, arg_state, n, buf) - unsigned int seed; - char *arg_state; - size_t n; - struct random_data *buf; +__initstate_r (unsigned int seed, char *arg_state, size_t n, + struct random_data *buf) { if (buf == NULL) goto fail; diff --git a/stdlib/setenv.c b/stdlib/setenv.c index d39eed34b3..4064a52651 100644 --- a/stdlib/setenv.c +++ b/stdlib/setenv.c @@ -117,11 +117,8 @@ static char **last_environ; to reuse values once generated for a `setenv' call since we can never free the strings. */ int -__add_to_environ (name, value, combined, replace) - const char *name; - const char *value; - const char *combined; - int replace; +__add_to_environ (const char *name, const char *value, const char *combined, + int replace) { char **ep; size_t size; diff --git a/stdlib/submul_1.c b/stdlib/submul_1.c index b3f5c9459c..5e4f504ff0 100644 --- a/stdlib/submul_1.c +++ b/stdlib/submul_1.c @@ -26,11 +26,8 @@ along with the GNU MP Library; see the file COPYING.LIB. If not, see #include "longlong.h" mp_limb_t -mpn_submul_1 (res_ptr, s1_ptr, s1_size, s2_limb) - register mp_ptr res_ptr; - register mp_srcptr s1_ptr; - mp_size_t s1_size; - register mp_limb_t s2_limb; +mpn_submul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr, + mp_size_t s1_size, register mp_limb_t s2_limb) { register mp_limb_t cy_limb; register mp_size_t j; -- cgit v1.2.3