commit f63f2bfdfaad591305863a79c4fd2c3f50015f26

Author: Joseph Myers <joseph@codesourcery.com>

Date:   Mon Oct 19 21:23:47 2015 +0000

    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.

Conflicts:

	misc/hsearch_r.c

	  (Missing backport of fix for swbz#17996.)

	nptl/pthread_barrier_init.c

	  (Missing backport of fix for swbz#18544.)

	sysdeps/pthread/timer_settime.c

	  (Applied to nptl/sysdeps/pthread/timer_settime.c.)

	sysdeps/sparc/nptl/pthread_barrier_init.c

	  (Missing fix for swbz#18544.  Applied to

	  nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c.)

	sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c

	  (Missing backport of d83f0734e1522a5e5ea2494565f4dcd25a86d6a0,

	  HPPA: Transition to new non-addon NPTL; files removed manually.)

	sysdeps/unix/sysv/linux/timer_settime.c

	  (Applied to nptl/sysdeps/unix/sysv/linux/timer_settime.c.)

diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c

index 1ad36c7d05e7b7c1..647debc9ec98f3fb 100644

--- a/crypt/crypt-entry.c

+++ b/crypt/crypt-entry.c

@@ -81,10 +81,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 bbb2ca2b58490e35..954bbfcfebd169b6 100644

--- a/crypt/crypt_util.c

+++ b/crypt/crypt_util.c

@@ -805,10 +805,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 bad6ec65e25de31b..09a9c2eacf1fcaea 100644

--- a/libio/genops.c

+++ b/libio/genops.c

@@ -600,12 +600,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 d5c28f31c377905a..f1ac641ee6537fd6 100644

--- a/libio/iofopncook.c

+++ b/libio/iofopncook.c

@@ -170,10 +170,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,

 _IO_FILE *

-_IO_fopencookie (cookie, mode, io_functions)

-     void *cookie;

-     const char *mode;

-     _IO_cookie_io_functions_t io_functions;

+_IO_fopencookie (void *cookie, const char *mode,

+		 _IO_cookie_io_functions_t io_functions)

 {

   int read_write;

   struct locked_FILE

@@ -264,10 +262,8 @@ static const struct _IO_jump_t _IO_old_cookie_jumps libio_vtable = {

 _IO_FILE *

 attribute_compat_text_section

-_IO_old_fopencookie (cookie, mode, io_functions)

-     void *cookie;

-     const char *mode;

-     _IO_cookie_io_functions_t io_functions;

+_IO_old_fopencookie (void *cookie, const char *mode,

+		     _IO_cookie_io_functions_t io_functions)

 {

   _IO_FILE *ret;

diff --git a/libio/iofwrite_u.c b/libio/iofwrite_u.c

index a1077eeb922640d3..99b049cc37beb6de 100644

--- a/libio/iofwrite_u.c

+++ b/libio/iofwrite_u.c

@@ -30,11 +30,8 @@

 #undef fwrite_unlocked

 _IO_size_t

-fwrite_unlocked (buf, size, count, fp)

-     const void *buf;

-     _IO_size_t size;

-     _IO_size_t count;

-     _IO_FILE *fp;

+fwrite_unlocked (const void *buf, _IO_size_t size, _IO_size_t count,

+		 _IO_FILE *fp)

 {

   _IO_size_t request = size * count;

   _IO_size_t written = 0;

diff --git a/libio/iogetline.c b/libio/iogetline.c

index bdb35b30fbcf1bee..a521e94949c42d4e 100644

--- a/libio/iogetline.c

+++ b/libio/iogetline.c

@@ -28,12 +28,8 @@

 #include <string.h>

 _IO_size_t

-_IO_getline (fp, buf, n, delim, extract_delim)

-     _IO_FILE *fp;

-     char *buf;

-     _IO_size_t n;

-     int delim;

-     int extract_delim;

+_IO_getline (_IO_FILE *fp, char *buf, _IO_size_t n, int delim,

+	     int extract_delim)

 {

   return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);

 }

@@ -48,13 +44,8 @@ libc_hidden_def (_IO_getline)

    If extract_delim > 0, insert delim in output. */

 _IO_size_t

-_IO_getline_info (fp, buf, n, delim, extract_delim, eof)

-     _IO_FILE *fp;

-     char *buf;

-     _IO_size_t n;

-     int delim;

-     int extract_delim;

-     int *eof;

+_IO_getline_info (_IO_FILE *fp, char *buf, _IO_size_t n, int delim,

+		  int extract_delim, int *eof)

 {

   char *ptr = buf;

   if (eof != NULL)

diff --git a/libio/iogetwline.c b/libio/iogetwline.c

index 63b7da67201b3f10..b14aa615e4537fda 100644

--- a/libio/iogetwline.c

+++ b/libio/iogetwline.c

@@ -33,12 +33,8 @@

 #endif

 _IO_size_t

-_IO_getwline (fp, buf, n, delim, extract_delim)

-     _IO_FILE *fp;

-     wchar_t *buf;

-     _IO_size_t n;

-     wint_t delim;

-     int extract_delim;

+_IO_getwline (_IO_FILE *fp, wchar_t *buf, _IO_size_t n, wint_t delim,

+	      int extract_delim)

 {

   return _IO_getwline_info (fp, buf, n, delim, extract_delim, (wint_t *) 0);

 }

@@ -52,13 +48,8 @@ _IO_getwline (fp, buf, n, delim, extract_delim)

    If extract_delim > 0, insert delim in output. */

 _IO_size_t

-_IO_getwline_info (fp, buf, n, delim, extract_delim, eof)

-     _IO_FILE *fp;

-     wchar_t *buf;

-     _IO_size_t n;

-     wint_t delim;

-     int extract_delim;

-     wint_t *eof;

+_IO_getwline_info (_IO_FILE *fp, wchar_t *buf, _IO_size_t n, wint_t delim,

+		   int extract_delim, wint_t *eof)

 {

   wchar_t *ptr = buf;

   if (eof != NULL)

diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c

index 4e76a8c8fc035430..8711767fb1df32e8 100644

--- a/libio/vsnprintf.c

+++ b/libio/vsnprintf.c

@@ -90,11 +90,8 @@ const struct _IO_jump_t _IO_strn_jumps libio_vtable attribute_hidden =

 int

-_IO_vsnprintf (string, maxlen, format, args)

-     char *string;

-     _IO_size_t maxlen;

-     const char *format;

-     _IO_va_list args;

+_IO_vsnprintf (char *string, _IO_size_t maxlen, const char *format,

+	       _IO_va_list args)

 {

   _IO_strnfile sf;

   int ret;

diff --git a/libio/vswprintf.c b/libio/vswprintf.c

index 5cd58de2e88939d9..b42333822052fda4 100644

--- a/libio/vswprintf.c

+++ b/libio/vswprintf.c

@@ -89,11 +89,8 @@ const struct _IO_jump_t _IO_wstrn_jumps libio_vtable attribute_hidden =

 int

-_IO_vswprintf (string, maxlen, format, args)

-     wchar_t *string;

-     _IO_size_t maxlen;

-     const wchar_t *format;

-     _IO_va_list args;

+_IO_vswprintf (wchar_t *string, _IO_size_t maxlen, const wchar_t *format,

+	       _IO_va_list args)

 {

   _IO_wstrnfile sf;

   int ret;

diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c

index b08e60ac72185ad9..a7e2d2bb988686a7 100644

--- a/locale/programs/simple-hash.c

+++ b/locale/programs/simple-hash.c

@@ -120,13 +120,8 @@ insert_entry (hash_table *htab, const void *key, size_t keylen, void *data)

 }

 static void

-insert_entry_2 (htab, key, keylen, hval, idx, data)

-     hash_table *htab;

-     const void *key;

-     size_t keylen;

-     unsigned long int hval;

-     size_t idx;

-     void *data;

+insert_entry_2 (hash_table *htab, const void *key, size_t keylen,

+		unsigned long int hval, size_t idx, void *data)

 {

   hash_entry *table = (hash_entry *) htab->table;

@@ -175,11 +170,8 @@ insert_entry_2 (htab, key, keylen, hval, idx, data)

 int

-find_entry (htab, key, keylen, result)

-     const hash_table *htab;

-     const void *key;

-     size_t keylen;

-     void **result;

+find_entry (const hash_table *htab, const void *key, size_t keylen,

+	    void **result)

 {

   hash_entry *table = (hash_entry *) htab->table;

   size_t idx = lookup (htab, key, keylen, compute_hashval (key, keylen));

@@ -207,12 +199,8 @@ set_entry (hash_table *htab, const void *key, size_t keylen, void *newval)

 int

-iterate_table (htab, ptr, key, keylen, data)

-     const hash_table *htab;

-     void **ptr;

-     const void **key;

-     size_t *keylen;

-     void **data;

+iterate_table (const hash_table *htab, void **ptr, const void **key,

+	       size_t *keylen, void **data)

 {

   if (*ptr == NULL)

     {

@@ -239,11 +227,8 @@ iterate_table (htab, ptr, key, keylen, data)

    [Knuth]	      The Art of Computer Programming, part3 (6.4) */

 static size_t

-lookup (htab, key, keylen, hval)

-     const hash_table *htab;

-     const void *key;

-     size_t keylen;

-     unsigned long int hval;

+lookup (const hash_table *htab, const void *key, size_t keylen,

+	unsigned long int hval)

 {

   unsigned long int hash;

   size_t idx;

diff --git a/login/forkpty.c b/login/forkpty.c

index e5e2873534801140..397d60dd63fc3171 100644

--- a/login/forkpty.c

+++ b/login/forkpty.c

@@ -23,11 +23,8 @@

 #include <pty.h>

 int

-forkpty (amaster, name, termp, winp)

-     int *amaster;

-     char *name;

-     const struct termios *termp;

-     const struct winsize *winp;

+forkpty (int *amaster, char *name, const struct termios *termp,

+	 const struct winsize *winp)

 {

   int master, slave, pid;

diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c

index 3509fb7b20fe524e..a71bb7d3412bf242 100644

--- a/misc/hsearch_r.c

+++ b/misc/hsearch_r.c

@@ -147,11 +147,8 @@ libc_hidden_def (hdestroy_r)

    equality of the stored and the parameter value. This helps to prevent

    unnecessary expensive calls of strcmp.  */

 int

-hsearch_r (item, action, retval, htab)

-     ENTRY item;

-     ACTION action;

-     ENTRY **retval;

-     struct hsearch_data *htab;

+hsearch_r (ENTRY item, ACTION action, ENTRY **retval,

+	   struct hsearch_data *htab)

 {

   unsigned int hval;

   unsigned int count;

diff --git a/misc/select.c b/misc/select.c

index 8f5cb0d2af26b573..f134b0453d9be90c 100644

--- a/misc/select.c

+++ b/misc/select.c

@@ -25,12 +25,8 @@

    after waiting the interval specified therein.  Returns the number of ready

    descriptors, or -1 for errors.  */

 int

-__select (nfds, readfds, writefds, exceptfds, timeout)

-     int nfds;

-     fd_set *readfds;

-     fd_set *writefds;

-     fd_set *exceptfds;

-     struct timeval *timeout;

+__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,

+	  struct timeval *timeout)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c

index 88fd43ca8d8c45ab..e15723611c71d55a 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 5ec4cf2ea3137274..38873877107fec86 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 a8d113f9a5273c0c..fe95f96d1b8ef8e5 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 8cd6f0e56ee6be1b..55849b7948e34fac 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 937d02428e52718a..dbe4893619cb17ef 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 de81dbc068148ad5..dbff8a984196e6e4 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 a0dcc7896305daeb..f9b5609bf10cd81a 100644

--- a/nptl/pthread_mutex_setprioceiling.c

+++ b/nptl/pthread_mutex_setprioceiling.c

@@ -23,10 +23,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 56d103278dc44c83..2fa97d9024686e24 100644

--- a/nptl/pthread_mutexattr_getprioceiling.c

+++ b/nptl/pthread_mutexattr_getprioceiling.c

@@ -21,9 +21,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 2f6c8fad0f262778..0acd59b223984c37 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 b7622abfa2478283..59f871d0eebb1202 100644

--- a/nptl/pthread_rwlock_timedrdlock.c

+++ b/nptl/pthread_rwlock_timedrdlock.c

@@ -25,9 +25,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;

diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c

index 5f2399f91e884b78..e344005f1017384e 100644

--- a/nptl/pthread_rwlock_timedwrlock.c

+++ b/nptl/pthread_rwlock_timedwrlock.c

@@ -25,9 +25,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;

diff --git a/nptl/pthread_setschedparam.c b/nptl/pthread_setschedparam.c

index 15d26b4116bfc1c5..a0fa578821ceea51 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;

diff --git a/nptl/sysdeps/pthread/timer_settime.c b/nptl/sysdeps/pthread/timer_settime.c

index da0908b0bcad6da7..e86d0a3d231faf09 100644

--- a/nptl/sysdeps/pthread/timer_settime.c

+++ b/nptl/sysdeps/pthread/timer_settime.c

@@ -25,11 +25,8 @@

 /* Set timer TIMERID to VALUE, returning old value in OVLAUE.  */

 int

-timer_settime (timerid, flags, value, ovalue)

-     timer_t timerid;

-     int flags;

-     const struct itimerspec *value;

-     struct itimerspec *ovalue;

+timer_settime (timer_t timerid, int flags, const struct itimerspec *value,

+	       struct itimerspec *ovalue)

 {

   struct timer_node *timer;

   struct thread_node *thread = NULL;

diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c b/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c

index 5e3774fbd4ed3754..2782e93411ce01b8 100644

--- a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c

+++ b/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c

@@ -21,10 +21,8 @@

 #include <lowlevellock.h>

 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)

 {

   union sparc_pthread_barrier *ibarrier;

diff --git a/nptl/sysdeps/unix/sysv/linux/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/timer_settime.c

index 5b522ec75040f12c..94acc60a0f86b72c 100644

--- a/nptl/sysdeps/unix/sysv/linux/timer_settime.c

+++ b/nptl/sysdeps/unix/sysv/linux/timer_settime.c

@@ -30,11 +30,8 @@

 int

-timer_settime (timerid, flags, value, ovalue)

-     timer_t timerid;

-     int flags;

-     const struct itimerspec *value;

-     struct itimerspec *ovalue;

+timer_settime (timer_t timerid, int flags, const struct itimerspec *value,

+	       struct itimerspec *ovalue)

 {

 #undef timer_settime

   struct timer *kt = (struct timer *) timerid;

diff --git a/socket/recvfrom.c b/socket/recvfrom.c

index b99774f368501b55..f652b1478b7a6e32 100644

--- a/socket/recvfrom.c

+++ b/socket/recvfrom.c

@@ -22,13 +22,8 @@

    at address ADDR (which is ADDR_LEN bytes long).

    Returns the number read or -1 for errors.  */

 ssize_t

-__recvfrom (fd, buf, n, flags, addr, addr_len)

-     int fd;

-     void *buf;

-     size_t n;

-     int flags;

-     __SOCKADDR_ARG addr;

-     socklen_t *addr_len;

+__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addr,

+	    socklen_t *addr_len)

 {

   __set_errno (ENOSYS);

   return -1;

diff --git a/socket/sendto.c b/socket/sendto.c

index ae06a54cc6947a7f..090fd000799c9347 100644

--- a/socket/sendto.c