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
<https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and
<https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>.

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.

63 files changed, 229 insertions, 354 deletions

diff --git a/ChangeLog b/ChangeLog
index cc2e93934b..a4e316cb0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+2015-10-19  Joseph Myers  <joseph@codesourcery.com>
+
+	* 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.
+
 2015-10-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* config.make.in (have-ssp): Delete.
diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c
index 73b369c8c1..f7b394987c 100644
--- a/crypt/crypt-entry.c
+++ b/crypt/crypt-entry.c
@@ -71,10 +71,8 @@ extern struct crypt_data _ufc_foobar;
  */
 
 char *
-__crypt_r (key, salt, data)
-     const char *key;
-     const char *salt;
-     struct crypt_data * __restrict data;
+__crypt_r (const char *key, const char *salt,
+	   struct crypt_data * __restrict data)
 {
   ufc_long res[4];
   char ktab[9];
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 33d894a968..f78861cf18 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -797,10 +797,8 @@ _ufc_output_conversion_r(v1, v2, salt, __data)
  */
 
 void
-__encrypt_r(__block, __edflag, __data)
-     char *__block;
-     int __edflag;
-     struct crypt_data * __restrict __data;
+__encrypt_r (char *__block, int __edflag,
+	     struct crypt_data * __restrict __data)
 {
   ufc_long l1, l2, r1, r2, res[4];
   int i;
diff --git a/libio/genops.c b/libio/genops.c
index 873bd77c3a..377bda311f 100644
--- a/libio/genops.c
+++ b/libio/genops.c
@@ -596,12 +596,8 @@ _IO_old_init (_IO_FILE *fp, int flags)
 }
 
 void
-_IO_no_init (fp, flags, orientation, wd, jmp)
-     _IO_FILE *fp;
-     int flags;
-     int orientation;
-     struct _IO_wide_data *wd;
-     const struct _IO_jump_t *jmp;
+_IO_no_init (_IO_FILE *fp, int flags, int orientation,
+	     struct _IO_wide_data *wd, const struct _IO_jump_t *jmp)
 {
   _IO_old_init (fp, flags);
   fp->_mode = orientation;
diff --git a/libio/iofopncook.c b/libio/iofopncook.c
index b16a263e8a..3998bc5dce 100644
--- a/libio/iofopncook.c
+++ b/libio/iofopncook.c
@@ -149,10 +149,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,