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. --- nptl/cleanup_defer_compat.c | 5 ++--- nptl/old_pthread_cond_init.c | 5 ++--- nptl/old_pthread_cond_timedwait.c | 6 ++---- nptl/pthread_barrier_init.c | 6 ++---- nptl/pthread_barrierattr_getpshared.c | 5 ++--- nptl/pthread_getschedparam.c | 6 ++---- nptl/pthread_mutex_setprioceiling.c | 6 ++---- nptl/pthread_mutexattr_getprioceiling.c | 5 ++--- nptl/pthread_rwlock_init.c | 5 ++--- nptl/pthread_rwlock_timedrdlock.c | 5 ++--- nptl/pthread_rwlock_timedwrlock.c | 5 ++--- nptl/pthread_setschedparam.c | 6 ++---- 12 files changed, 24 insertions(+), 41 deletions(-) (limited to 'nptl') diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c index bd70b89556..e4fa87dd01 100644 --- a/nptl/cleanup_defer_compat.c +++ b/nptl/cleanup_defer_compat.c @@ -59,9 +59,8 @@ strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer) void -_pthread_cleanup_pop_restore (buffer, execute) - struct _pthread_cleanup_buffer *buffer; - int execute; +_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer, + int execute) { struct pthread *self = THREAD_SELF; diff --git a/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c index 815e67e15a..f64095b15c 100644 --- a/nptl/old_pthread_cond_init.c +++ b/nptl/old_pthread_cond_init.c @@ -23,9 +23,8 @@ #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2) int -__pthread_cond_init_2_0 (cond, cond_attr) - pthread_cond_2_0_t *cond; - const pthread_condattr_t *cond_attr; +__pthread_cond_init_2_0 (pthread_cond_2_0_t *cond, + const pthread_condattr_t *cond_attr) { struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr; diff --git a/nptl/old_pthread_cond_timedwait.c b/nptl/old_pthread_cond_timedwait.c index 501f2abb23..b98884febd 100644 --- a/nptl/old_pthread_cond_timedwait.c +++ b/nptl/old_pthread_cond_timedwait.c @@ -25,10 +25,8 @@ #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2) int -__pthread_cond_timedwait_2_0 (cond, mutex, abstime) - pthread_cond_2_0_t *cond; - pthread_mutex_t *mutex; - const struct timespec *abstime; +__pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex, + const struct timespec *abstime) { if (cond->cond == NULL) { diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c index 8fe15ecba5..bf5b002068 100644 --- a/nptl/pthread_barrier_init.c +++ b/nptl/pthread_barrier_init.c @@ -29,10 +29,8 @@ static const struct pthread_barrierattr default_barrierattr = int -__pthread_barrier_init (barrier, attr, count) - pthread_barrier_t *barrier; - const pthread_barrierattr_t *attr; - unsigned int count; +__pthread_barrier_init (pthread_barrier_t *barrier, + const pthread_barrierattr_t *attr, unsigned int count) { struct pthread_barrier *ibarrier; diff --git a/nptl/pthread_barrierattr_getpshared.c b/nptl/pthread_barrierattr_getpshared.c index 174161f25b..de62be896d 100644 --- a/nptl/pthread_barrierattr_getpshared.c +++ b/nptl/pthread_barrierattr_getpshared.c @@ -20,9 +20,8 @@ int -pthread_barrierattr_getpshared (attr, pshared) - const pthread_barrierattr_t *attr; - int *pshared; +pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr, + int *pshared) { *pshared = ((const struct pthread_barrierattr *) attr)->pshared; diff --git a/nptl/pthread_getschedparam.c b/nptl/pthread_getschedparam.c index 5de8924007..7c38223b6f 100644 --- a/nptl/pthread_getschedparam.c +++ b/nptl/pthread_getschedparam.c @@ -23,10 +23,8 @@ int -__pthread_getschedparam (threadid, policy, param) - pthread_t threadid; - int *policy; - struct sched_param *param; +__pthread_getschedparam (pthread_t threadid, int *policy, + struct sched_param *param) { struct pthread *pd = (struct pthread *) threadid; diff --git a/nptl/pthread_mutex_setprioceiling.c b/nptl/pthread_mutex_setprioceiling.c index 1be7471c91..0edaa241df 100644 --- a/nptl/pthread_mutex_setprioceiling.c +++ b/nptl/pthread_mutex_setprioceiling.c @@ -24,10 +24,8 @@ int -pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling) - pthread_mutex_t *mutex; - int prioceiling; - int *old_ceiling; +pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling, + int *old_ceiling) { /* The low bits of __kind aren't ever changed after pthread_mutex_init, so we don't need a lock yet. */ diff --git a/nptl/pthread_mutexattr_getprioceiling.c b/nptl/pthread_mutexattr_getprioceiling.c index 2f73ea276c..7d52f7e68a 100644 --- a/nptl/pthread_mutexattr_getprioceiling.c +++ b/nptl/pthread_mutexattr_getprioceiling.c @@ -22,9 +22,8 @@ int -pthread_mutexattr_getprioceiling (attr, prioceiling) - const pthread_mutexattr_t *attr; - int *prioceiling; +pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr, + int *prioceiling) { const struct pthread_mutexattr *iattr; int ceiling; diff --git a/nptl/pthread_rwlock_init.c b/nptl/pthread_rwlock_init.c index 99ab5e35cb..7483e5ec4c 100644 --- a/nptl/pthread_rwlock_init.c +++ b/nptl/pthread_rwlock_init.c @@ -29,9 +29,8 @@ static const struct pthread_rwlockattr default_rwlockattr = int -__pthread_rwlock_init (rwlock, attr) - pthread_rwlock_t *rwlock; - const pthread_rwlockattr_t *attr; +__pthread_rwlock_init (pthread_rwlock_t *rwlock, + const pthread_rwlockattr_t *attr) { const struct pthread_rwlockattr *iattr; diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c index 93d235e9e1..8ef124917e 100644 --- a/nptl/pthread_rwlock_timedrdlock.c +++ b/nptl/pthread_rwlock_timedrdlock.c @@ -28,9 +28,8 @@ /* Try to acquire read lock for RWLOCK or return after specfied time. */ int -pthread_rwlock_timedrdlock (rwlock, abstime) - pthread_rwlock_t *rwlock; - const struct timespec *abstime; +pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) { int result = 0; bool wake = false; diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c index 615623a75d..5ae6f6a53a 100644 --- a/nptl/pthread_rwlock_timedwrlock.c +++ b/nptl/pthread_rwlock_timedwrlock.c @@ -28,9 +28,8 @@ /* Try to acquire write lock for RWLOCK or return after specfied time. */ int -pthread_rwlock_timedwrlock (rwlock, abstime) - pthread_rwlock_t *rwlock; - const struct timespec *abstime; +pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock, + const struct timespec *abstime) { int result = 0; bool wake_readers = false; diff --git a/nptl/pthread_setschedparam.c b/nptl/pthread_setschedparam.c index 41a629df93..c52184fbd9 100644 --- a/nptl/pthread_setschedparam.c +++ b/nptl/pthread_setschedparam.c @@ -24,10 +24,8 @@ int -__pthread_setschedparam (threadid, policy, param) - pthread_t threadid; - int policy; - const struct sched_param *param; +__pthread_setschedparam (pthread_t threadid, int policy, + const struct sched_param *param) { struct pthread *pd = (struct pthread *) threadid; -- cgit 1.4.1