Blame SOURCES/glibc-rh1505492-prototypes-13.patch

c6d234
commit f63f2bfdfaad591305863a79c4fd2c3f50015f26
c6d234
Author: Joseph Myers <joseph@codesourcery.com>
c6d234
Date:   Mon Oct 19 21:23:47 2015 +0000
c6d234
c6d234
    Convert 69 more function definitions to prototype style (line wrap cases).
c6d234
    
c6d234
    This automatically-generated patch converts 69 function definitions in
c6d234
    glibc from old-style K&R to prototype-style.
c6d234
    
c6d234
    This patch, covering both sysdeps and non-sysdeps files, deals with
c6d234
    cases where the prototype needed to be wrapped over more than one
c6d234
    line.  Otherwise, exclusions and caveats are as for
c6d234
    <https://sourceware.org/ml/libc-alpha/2015-10/msg00594.html> and
c6d234
    <https://sourceware.org/ml/libc-alpha/2015-10/msg00599.html>.
c6d234
    
c6d234
    Tested for x86_64 and x86 (testsuite, and that installed stripped
c6d234
    shared libraries are unchanged by the patch).
c6d234
    
c6d234
            * crypt/crypt-entry.c (__crypt_r): Convert to prototype-style
c6d234
            function definition.
c6d234
            * crypt/crypt_util.c (__encrypt_r): Likewise.
c6d234
            * libio/genops.c (_IO_no_init): Likewise.
c6d234
            * libio/iofopncook.c (_IO_fopencookie): Likewise.
c6d234
            (_IO_old_fopencookie): Likewise.
c6d234
            * libio/iofwrite_u.c (fwrite_unlocked): Likewise.
c6d234
            * libio/iogetline.c (_IO_getline): Likewise.
c6d234
            (_IO_getline_info): Likewise.
c6d234
            * libio/iogetwline.c (_IO_getwline): Likewise.
c6d234
            (_IO_getwline_info): Likewise.
c6d234
            * libio/vsnprintf.c (_IO_vsnprintf): Likewise.
c6d234
            * libio/vswprintf.c (_IO_vswprintf): Likewise.
c6d234
            * locale/programs/simple-hash.c (insert_entry_2): Likewise.
c6d234
            (find_entry): Likewise.
c6d234
            (iterate_table): Likewise.
c6d234
            (lookup): Likewise.
c6d234
            * login/forkpty.c (forkpty): Likewise.
c6d234
            * misc/hsearch_r.c (__hsearch_r): Likewise.
c6d234
            * misc/select.c (__select): Likewise.
c6d234
            * nptl/cleanup_defer_compat.c (_pthread_cleanup_pop_restore):
c6d234
            Likewise.
c6d234
            * nptl/old_pthread_cond_init.c (__pthread_cond_init_2_0):
c6d234
            Likewise.
c6d234
            * nptl/old_pthread_cond_timedwait.c
c6d234
            (__pthread_cond_timedwait_2_0): Likewise.
c6d234
            * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise.
c6d234
            * nptl/pthread_barrierattr_getpshared.c
c6d234
            (pthread_barrierattr_getpshared): Likewise.
c6d234
            * nptl/pthread_getschedparam.c (__pthread_getschedparam):
c6d234
            Likewise.
c6d234
            * nptl/pthread_mutex_setprioceiling.c
c6d234
            (pthread_mutex_setprioceiling): Likewise.
c6d234
            * nptl/pthread_mutexattr_getprioceiling.c
c6d234
            (pthread_mutexattr_getprioceiling): Likewise.
c6d234
            * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise.
c6d234
            * nptl/pthread_rwlock_timedrdlock.c (pthread_rwlock_timedrdlock):
c6d234
            Likewise.
c6d234
            * nptl/pthread_rwlock_timedwrlock.c (pthread_rwlock_timedwrlock):
c6d234
            Likewise.
c6d234
            * nptl/pthread_setschedparam.c (__pthread_setschedparam):
c6d234
            Likewise.
c6d234
            * socket/recvfrom.c (__recvfrom): Likewise.
c6d234
            * socket/sendto.c (__sendto): Likewise.
c6d234
            * socket/setsockopt.c (__setsockopt): Likewise.
c6d234
            * stdio-common/_itoa.c (_itoa): Likewise.
c6d234
            * stdio-common/_itowa.c (_itowa): Likewise.
c6d234
            * stdio-common/reg-printf.c (__register_printf_specifier):
c6d234
            Likewise.
c6d234
            (__register_printf_function): Likewise.
c6d234
            * stdio-common/tempname.c (__path_search): Likewise.
c6d234
            * stdlib/addmul_1.c (mpn_addmul_1): Likewise.
c6d234
            * stdlib/mul_1.c (mpn_mul_1): Likewise.
c6d234
            * stdlib/random_r.c (__initstate_r): Likewise.
c6d234
            * stdlib/setenv.c (__add_to_environ): Likewise.
c6d234
            * stdlib/submul_1.c (mpn_submul_1): Likewise.
c6d234
            * streams/getpmsg.c (getpmsg): Likewise.
c6d234
            * streams/putmsg.c (putmsg): Likewise.
c6d234
            * streams/putpmsg.c (putpmsg): Likewise.
c6d234
            * sunrpc/clnt_raw.c (clntraw_call): Likewise.
c6d234
            * sunrpc/clnt_tcp.c (clnttcp_call): Likewise.
c6d234
            * sunrpc/clnt_udp.c (clntudp_create): Likewise.
c6d234
            * sunrpc/clnt_unix.c (clntunix_call): Likewise.
c6d234
            * sunrpc/pm_getport.c (pmap_getport): Likewise.
c6d234
            * sunrpc/svc_udp.c (cache_get): Likewise.
c6d234
            * sunrpc/xdr_array.c (xdr_vector): Likewise.
c6d234
            * sysdeps/mach/hurd/getcwd.c
c6d234
            (__canonicalize_directory_name_internal): Likewise.
c6d234
            * sysdeps/mach/hurd/pselect.c (__pselect): Likewise.
c6d234
            * sysdeps/mach/hurd/recvfrom.c (__recvfrom): Likewise.
c6d234
            * sysdeps/mach/hurd/select.c (__select): Likewise.
c6d234
            * sysdeps/posix/ttyname_r.c (getttyname_r): Likewise.
c6d234
            * sysdeps/pthread/timer_settime.c (timer_settime): Likewise.
c6d234
            * sysdeps/sparc/nptl/pthread_barrier_init.c
c6d234
            (__pthread_barrier_init): Likewise.
c6d234
            * sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
c6d234
            (__pthread_cond_timedwait): Likewise.
c6d234
            * sysdeps/unix/sysv/linux/i386/putmsg.c (putmsg): Likewise.
c6d234
            * sysdeps/unix/sysv/linux/s390/semtimedop.c (semtimedop):
c6d234
            Likewise.
c6d234
            * sysdeps/unix/sysv/linux/semtimedop.c (semtimedop): Likewise.
c6d234
            * sysdeps/unix/sysv/linux/timer_settime.c (timer_settime):
c6d234
            Likewise.
c6d234
            * sysvipc/semtimedop.c (semtimedop): Likewise.
c6d234
            * time/setitimer.c (__setitimer): Likewise.
c6d234
            * time/strftime_l.c (emacs_strftime): Likewise.
c6d234
c6d234
Conflicts:
c6d234
	misc/hsearch_r.c
c6d234
	  (Missing backport of fix for swbz#17996.)
c6d234
	nptl/pthread_barrier_init.c
c6d234
	  (Missing backport of fix for swbz#18544.)
c6d234
	sysdeps/pthread/timer_settime.c
c6d234
	  (Applied to nptl/sysdeps/pthread/timer_settime.c.)
c6d234
	sysdeps/sparc/nptl/pthread_barrier_init.c
c6d234
	  (Missing fix for swbz#18544.  Applied to
c6d234
	  nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c.)
c6d234
	sysdeps/unix/sysv/linux/hppa/pthread_cond_timedwait.c
c6d234
	  (Missing backport of d83f0734e1522a5e5ea2494565f4dcd25a86d6a0,
c6d234
	  HPPA: Transition to new non-addon NPTL; files removed manually.)
c6d234
	sysdeps/unix/sysv/linux/timer_settime.c
c6d234
	  (Applied to nptl/sysdeps/unix/sysv/linux/timer_settime.c.)
c6d234
c6d234
diff --git a/crypt/crypt-entry.c b/crypt/crypt-entry.c
c6d234
index 1ad36c7d05e7b7c1..647debc9ec98f3fb 100644
c6d234
--- a/crypt/crypt-entry.c
c6d234
+++ b/crypt/crypt-entry.c
c6d234
@@ -81,10 +81,8 @@ extern struct crypt_data _ufc_foobar;
c6d234
  */
c6d234
 
c6d234
 char *
c6d234
-__crypt_r (key, salt, data)
c6d234
-     const char *key;
c6d234
-     const char *salt;
c6d234
-     struct crypt_data * __restrict data;
c6d234
+__crypt_r (const char *key, const char *salt,
c6d234
+	   struct crypt_data * __restrict data)
c6d234
 {
c6d234
   ufc_long res[4];
c6d234
   char ktab[9];
c6d234
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
c6d234
index bbb2ca2b58490e35..954bbfcfebd169b6 100644
c6d234
--- a/crypt/crypt_util.c
c6d234
+++ b/crypt/crypt_util.c
c6d234
@@ -805,10 +805,8 @@ _ufc_output_conversion_r(v1, v2, salt, __data)
c6d234
  */
c6d234
 
c6d234
 void
c6d234
-__encrypt_r(__block, __edflag, __data)
c6d234
-     char *__block;
c6d234
-     int __edflag;
c6d234
-     struct crypt_data * __restrict __data;
c6d234
+__encrypt_r (char *__block, int __edflag,
c6d234
+	     struct crypt_data * __restrict __data)
c6d234
 {
c6d234
   ufc_long l1, l2, r1, r2, res[4];
c6d234
   int i;
c6d234
diff --git a/libio/genops.c b/libio/genops.c
c6d234
index bad6ec65e25de31b..09a9c2eacf1fcaea 100644
c6d234
--- a/libio/genops.c
c6d234
+++ b/libio/genops.c
c6d234
@@ -600,12 +600,8 @@ _IO_old_init (_IO_FILE *fp, int flags)
c6d234
 }
c6d234
 
c6d234
 void
c6d234
-_IO_no_init (fp, flags, orientation, wd, jmp)
c6d234
-     _IO_FILE *fp;
c6d234
-     int flags;
c6d234
-     int orientation;
c6d234
-     struct _IO_wide_data *wd;
c6d234
-     const struct _IO_jump_t *jmp;
c6d234
+_IO_no_init (_IO_FILE *fp, int flags, int orientation,
c6d234
+	     struct _IO_wide_data *wd, const struct _IO_jump_t *jmp)
c6d234
 {
c6d234
   _IO_old_init (fp, flags);
c6d234
   fp->_mode = orientation;
c6d234
diff --git a/libio/iofopncook.c b/libio/iofopncook.c
c6d234
index d5c28f31c377905a..f1ac641ee6537fd6 100644
c6d234
--- a/libio/iofopncook.c
c6d234
+++ b/libio/iofopncook.c
c6d234
@@ -170,10 +170,8 @@ _IO_cookie_init (struct _IO_cookie_file *cfile, int read_write,
c6d234
 
c6d234
 
c6d234
 _IO_FILE *
c6d234
-_IO_fopencookie (cookie, mode, io_functions)
c6d234
-     void *cookie;
c6d234
-     const char *mode;
c6d234
-     _IO_cookie_io_functions_t io_functions;
c6d234
+_IO_fopencookie (void *cookie, const char *mode,
c6d234
+		 _IO_cookie_io_functions_t io_functions)
c6d234
 {
c6d234
   int read_write;
c6d234
   struct locked_FILE
c6d234
@@ -264,10 +262,8 @@ static const struct _IO_jump_t _IO_old_cookie_jumps libio_vtable = {
c6d234
 
c6d234
 _IO_FILE *
c6d234
 attribute_compat_text_section
c6d234
-_IO_old_fopencookie (cookie, mode, io_functions)
c6d234
-     void *cookie;
c6d234
-     const char *mode;
c6d234
-     _IO_cookie_io_functions_t io_functions;
c6d234
+_IO_old_fopencookie (void *cookie, const char *mode,
c6d234
+		     _IO_cookie_io_functions_t io_functions)
c6d234
 {
c6d234
   _IO_FILE *ret;
c6d234
 
c6d234
diff --git a/libio/iofwrite_u.c b/libio/iofwrite_u.c
c6d234
index a1077eeb922640d3..99b049cc37beb6de 100644
c6d234
--- a/libio/iofwrite_u.c
c6d234
+++ b/libio/iofwrite_u.c
c6d234
@@ -30,11 +30,8 @@
c6d234
 #undef fwrite_unlocked
c6d234
 
c6d234
 _IO_size_t
c6d234
-fwrite_unlocked (buf, size, count, fp)
c6d234
-     const void *buf;
c6d234
-     _IO_size_t size;
c6d234
-     _IO_size_t count;
c6d234
-     _IO_FILE *fp;
c6d234
+fwrite_unlocked (const void *buf, _IO_size_t size, _IO_size_t count,
c6d234
+		 _IO_FILE *fp)
c6d234
 {
c6d234
   _IO_size_t request = size * count;
c6d234
   _IO_size_t written = 0;
c6d234
diff --git a/libio/iogetline.c b/libio/iogetline.c
c6d234
index bdb35b30fbcf1bee..a521e94949c42d4e 100644
c6d234
--- a/libio/iogetline.c
c6d234
+++ b/libio/iogetline.c
c6d234
@@ -28,12 +28,8 @@
c6d234
 #include <string.h>
c6d234
 
c6d234
 _IO_size_t
c6d234
-_IO_getline (fp, buf, n, delim, extract_delim)
c6d234
-     _IO_FILE *fp;
c6d234
-     char *buf;
c6d234
-     _IO_size_t n;
c6d234
-     int delim;
c6d234
-     int extract_delim;
c6d234
+_IO_getline (_IO_FILE *fp, char *buf, _IO_size_t n, int delim,
c6d234
+	     int extract_delim)
c6d234
 {
c6d234
   return _IO_getline_info (fp, buf, n, delim, extract_delim, (int *) 0);
c6d234
 }
c6d234
@@ -48,13 +44,8 @@ libc_hidden_def (_IO_getline)
c6d234
    If extract_delim > 0, insert delim in output. */
c6d234
 
c6d234
 _IO_size_t
c6d234
-_IO_getline_info (fp, buf, n, delim, extract_delim, eof)
c6d234
-     _IO_FILE *fp;
c6d234
-     char *buf;
c6d234
-     _IO_size_t n;
c6d234
-     int delim;
c6d234
-     int extract_delim;
c6d234
-     int *eof;
c6d234
+_IO_getline_info (_IO_FILE *fp, char *buf, _IO_size_t n, int delim,
c6d234
+		  int extract_delim, int *eof)
c6d234
 {
c6d234
   char *ptr = buf;
c6d234
   if (eof != NULL)
c6d234
diff --git a/libio/iogetwline.c b/libio/iogetwline.c
c6d234
index 63b7da67201b3f10..b14aa615e4537fda 100644
c6d234
--- a/libio/iogetwline.c
c6d234
+++ b/libio/iogetwline.c
c6d234
@@ -33,12 +33,8 @@
c6d234
 #endif
c6d234
 
c6d234
 _IO_size_t
c6d234
-_IO_getwline (fp, buf, n, delim, extract_delim)
c6d234
-     _IO_FILE *fp;
c6d234
-     wchar_t *buf;
c6d234
-     _IO_size_t n;
c6d234
-     wint_t delim;
c6d234
-     int extract_delim;
c6d234
+_IO_getwline (_IO_FILE *fp, wchar_t *buf, _IO_size_t n, wint_t delim,
c6d234
+	      int extract_delim)
c6d234
 {
c6d234
   return _IO_getwline_info (fp, buf, n, delim, extract_delim, (wint_t *) 0);
c6d234
 }
c6d234
@@ -52,13 +48,8 @@ _IO_getwline (fp, buf, n, delim, extract_delim)
c6d234
    If extract_delim > 0, insert delim in output. */
c6d234
 
c6d234
 _IO_size_t
c6d234
-_IO_getwline_info (fp, buf, n, delim, extract_delim, eof)
c6d234
-     _IO_FILE *fp;
c6d234
-     wchar_t *buf;
c6d234
-     _IO_size_t n;
c6d234
-     wint_t delim;
c6d234
-     int extract_delim;
c6d234
-     wint_t *eof;
c6d234
+_IO_getwline_info (_IO_FILE *fp, wchar_t *buf, _IO_size_t n, wint_t delim,
c6d234
+		   int extract_delim, wint_t *eof)
c6d234
 {
c6d234
   wchar_t *ptr = buf;
c6d234
   if (eof != NULL)
c6d234
diff --git a/libio/vsnprintf.c b/libio/vsnprintf.c
c6d234
index 4e76a8c8fc035430..8711767fb1df32e8 100644
c6d234
--- a/libio/vsnprintf.c
c6d234
+++ b/libio/vsnprintf.c
c6d234
@@ -90,11 +90,8 @@ const struct _IO_jump_t _IO_strn_jumps libio_vtable attribute_hidden =
c6d234
 
c6d234
 
c6d234
 int
c6d234
-_IO_vsnprintf (string, maxlen, format, args)
c6d234
-     char *string;
c6d234
-     _IO_size_t maxlen;
c6d234
-     const char *format;
c6d234
-     _IO_va_list args;
c6d234
+_IO_vsnprintf (char *string, _IO_size_t maxlen, const char *format,
c6d234
+	       _IO_va_list args)
c6d234
 {
c6d234
   _IO_strnfile sf;
c6d234
   int ret;
c6d234
diff --git a/libio/vswprintf.c b/libio/vswprintf.c
c6d234
index 5cd58de2e88939d9..b42333822052fda4 100644
c6d234
--- a/libio/vswprintf.c
c6d234
+++ b/libio/vswprintf.c
c6d234
@@ -89,11 +89,8 @@ const struct _IO_jump_t _IO_wstrn_jumps libio_vtable attribute_hidden =
c6d234
 
c6d234
 
c6d234
 int
c6d234
-_IO_vswprintf (string, maxlen, format, args)
c6d234
-     wchar_t *string;
c6d234
-     _IO_size_t maxlen;
c6d234
-     const wchar_t *format;
c6d234
-     _IO_va_list args;
c6d234
+_IO_vswprintf (wchar_t *string, _IO_size_t maxlen, const wchar_t *format,
c6d234
+	       _IO_va_list args)
c6d234
 {
c6d234
   _IO_wstrnfile sf;
c6d234
   int ret;
c6d234
diff --git a/locale/programs/simple-hash.c b/locale/programs/simple-hash.c
c6d234
index b08e60ac72185ad9..a7e2d2bb988686a7 100644
c6d234
--- a/locale/programs/simple-hash.c
c6d234
+++ b/locale/programs/simple-hash.c
c6d234
@@ -120,13 +120,8 @@ insert_entry (hash_table *htab, const void *key, size_t keylen, void *data)
c6d234
 }
c6d234
 
c6d234
 static void
c6d234
-insert_entry_2 (htab, key, keylen, hval, idx, data)
c6d234
-     hash_table *htab;
c6d234
-     const void *key;
c6d234
-     size_t keylen;
c6d234
-     unsigned long int hval;
c6d234
-     size_t idx;
c6d234
-     void *data;
c6d234
+insert_entry_2 (hash_table *htab, const void *key, size_t keylen,
c6d234
+		unsigned long int hval, size_t idx, void *data)
c6d234
 {
c6d234
   hash_entry *table = (hash_entry *) htab->table;
c6d234
 
c6d234
@@ -175,11 +170,8 @@ insert_entry_2 (htab, key, keylen, hval, idx, data)
c6d234
 
c6d234
 
c6d234
 int
c6d234
-find_entry (htab, key, keylen, result)
c6d234
-     const hash_table *htab;
c6d234
-     const void *key;
c6d234
-     size_t keylen;
c6d234
-     void **result;
c6d234
+find_entry (const hash_table *htab, const void *key, size_t keylen,
c6d234
+	    void **result)
c6d234
 {
c6d234
   hash_entry *table = (hash_entry *) htab->table;
c6d234
   size_t idx = lookup (htab, key, keylen, compute_hashval (key, keylen));
c6d234
@@ -207,12 +199,8 @@ set_entry (hash_table *htab, const void *key, size_t keylen, void *newval)
c6d234
 
c6d234
 
c6d234
 int
c6d234
-iterate_table (htab, ptr, key, keylen, data)
c6d234
-     const hash_table *htab;
c6d234
-     void **ptr;
c6d234
-     const void **key;
c6d234
-     size_t *keylen;
c6d234
-     void **data;
c6d234
+iterate_table (const hash_table *htab, void **ptr, const void **key,
c6d234
+	       size_t *keylen, void **data)
c6d234
 {
c6d234
   if (*ptr == NULL)
c6d234
     {
c6d234
@@ -239,11 +227,8 @@ iterate_table (htab, ptr, key, keylen, data)
c6d234
    [Knuth]	      The Art of Computer Programming, part3 (6.4) */
c6d234
 
c6d234
 static size_t
c6d234
-lookup (htab, key, keylen, hval)
c6d234
-     const hash_table *htab;
c6d234
-     const void *key;
c6d234
-     size_t keylen;
c6d234
-     unsigned long int hval;
c6d234
+lookup (const hash_table *htab, const void *key, size_t keylen,
c6d234
+	unsigned long int hval)
c6d234
 {
c6d234
   unsigned long int hash;
c6d234
   size_t idx;
c6d234
diff --git a/login/forkpty.c b/login/forkpty.c
c6d234
index e5e2873534801140..397d60dd63fc3171 100644
c6d234
--- a/login/forkpty.c
c6d234
+++ b/login/forkpty.c
c6d234
@@ -23,11 +23,8 @@
c6d234
 #include <pty.h>
c6d234
 
c6d234
 int
c6d234
-forkpty (amaster, name, termp, winp)
c6d234
-     int *amaster;
c6d234
-     char *name;
c6d234
-     const struct termios *termp;
c6d234
-     const struct winsize *winp;
c6d234
+forkpty (int *amaster, char *name, const struct termios *termp,
c6d234
+	 const struct winsize *winp)
c6d234
 {
c6d234
   int master, slave, pid;
c6d234
 
c6d234
diff --git a/misc/hsearch_r.c b/misc/hsearch_r.c
c6d234
index 3509fb7b20fe524e..a71bb7d3412bf242 100644
c6d234
--- a/misc/hsearch_r.c
c6d234
+++ b/misc/hsearch_r.c
c6d234
@@ -147,11 +147,8 @@ libc_hidden_def (hdestroy_r)
c6d234
    equality of the stored and the parameter value. This helps to prevent
c6d234
    unnecessary expensive calls of strcmp.  */
c6d234
 int
c6d234
-hsearch_r (item, action, retval, htab)
c6d234
-     ENTRY item;
c6d234
-     ACTION action;
c6d234
-     ENTRY **retval;
c6d234
-     struct hsearch_data *htab;
c6d234
+hsearch_r (ENTRY item, ACTION action, ENTRY **retval,
c6d234
+	   struct hsearch_data *htab)
c6d234
 {
c6d234
   unsigned int hval;
c6d234
   unsigned int count;
c6d234
diff --git a/misc/select.c b/misc/select.c
c6d234
index 8f5cb0d2af26b573..f134b0453d9be90c 100644
c6d234
--- a/misc/select.c
c6d234
+++ b/misc/select.c
c6d234
@@ -25,12 +25,8 @@
c6d234
    after waiting the interval specified therein.  Returns the number of ready
c6d234
    descriptors, or -1 for errors.  */
c6d234
 int
c6d234
-__select (nfds, readfds, writefds, exceptfds, timeout)
c6d234
-     int nfds;
c6d234
-     fd_set *readfds;
c6d234
-     fd_set *writefds;
c6d234
-     fd_set *exceptfds;
c6d234
-     struct timeval *timeout;
c6d234
+__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
c6d234
+	  struct timeval *timeout)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c
c6d234
index 88fd43ca8d8c45ab..e15723611c71d55a 100644
c6d234
--- a/nptl/cleanup_defer_compat.c
c6d234
+++ b/nptl/cleanup_defer_compat.c
c6d234
@@ -59,9 +59,8 @@ strong_alias (_pthread_cleanup_push_defer, __pthread_cleanup_push_defer)
c6d234
 
c6d234
 
c6d234
 void
c6d234
-_pthread_cleanup_pop_restore (buffer, execute)
c6d234
-     struct _pthread_cleanup_buffer *buffer;
c6d234
-     int execute;
c6d234
+_pthread_cleanup_pop_restore (struct _pthread_cleanup_buffer *buffer,
c6d234
+			      int execute)
c6d234
 {
c6d234
   struct pthread *self = THREAD_SELF;
c6d234
 
c6d234
diff --git a/nptl/old_pthread_cond_init.c b/nptl/old_pthread_cond_init.c
c6d234
index 5ec4cf2ea3137274..38873877107fec86 100644
c6d234
--- a/nptl/old_pthread_cond_init.c
c6d234
+++ b/nptl/old_pthread_cond_init.c
c6d234
@@ -23,9 +23,8 @@
c6d234
 
c6d234
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
c6d234
 int
c6d234
-__pthread_cond_init_2_0 (cond, cond_attr)
c6d234
-     pthread_cond_2_0_t *cond;
c6d234
-     const pthread_condattr_t *cond_attr;
c6d234
+__pthread_cond_init_2_0 (pthread_cond_2_0_t *cond,
c6d234
+			 const pthread_condattr_t *cond_attr)
c6d234
 {
c6d234
   struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
c6d234
 
c6d234
diff --git a/nptl/old_pthread_cond_timedwait.c b/nptl/old_pthread_cond_timedwait.c
c6d234
index a8d113f9a5273c0c..fe95f96d1b8ef8e5 100644
c6d234
--- a/nptl/old_pthread_cond_timedwait.c
c6d234
+++ b/nptl/old_pthread_cond_timedwait.c
c6d234
@@ -25,10 +25,8 @@
c6d234
 
c6d234
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_3_2)
c6d234
 int
c6d234
-__pthread_cond_timedwait_2_0 (cond, mutex, abstime)
c6d234
-     pthread_cond_2_0_t *cond;
c6d234
-     pthread_mutex_t *mutex;
c6d234
-     const struct timespec *abstime;
c6d234
+__pthread_cond_timedwait_2_0 (pthread_cond_2_0_t *cond, pthread_mutex_t *mutex,
c6d234
+			      const struct timespec *abstime)
c6d234
 {
c6d234
   if (cond->cond == NULL)
c6d234
     {
c6d234
diff --git a/nptl/pthread_barrier_init.c b/nptl/pthread_barrier_init.c
c6d234
index 8cd6f0e56ee6be1b..55849b7948e34fac 100644
c6d234
--- a/nptl/pthread_barrier_init.c
c6d234
+++ b/nptl/pthread_barrier_init.c
c6d234
@@ -29,10 +29,8 @@ static const struct pthread_barrierattr default_barrierattr =
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_barrier_init (barrier, attr, count)
c6d234
-     pthread_barrier_t *barrier;
c6d234
-     const pthread_barrierattr_t *attr;
c6d234
-     unsigned int count;
c6d234
+pthread_barrier_init (pthread_barrier_t *barrier,
c6d234
+		      const pthread_barrierattr_t *attr, unsigned int count)
c6d234
 {
c6d234
   struct pthread_barrier *ibarrier;
c6d234
 
c6d234
diff --git a/nptl/pthread_barrierattr_getpshared.c b/nptl/pthread_barrierattr_getpshared.c
c6d234
index 937d02428e52718a..dbe4893619cb17ef 100644
c6d234
--- a/nptl/pthread_barrierattr_getpshared.c
c6d234
+++ b/nptl/pthread_barrierattr_getpshared.c
c6d234
@@ -20,9 +20,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_barrierattr_getpshared (attr, pshared)
c6d234
-     const pthread_barrierattr_t *attr;
c6d234
-     int *pshared;
c6d234
+pthread_barrierattr_getpshared (const pthread_barrierattr_t *attr,
c6d234
+				int *pshared)
c6d234
 {
c6d234
   *pshared = ((const struct pthread_barrierattr *) attr)->pshared;
c6d234
 
c6d234
diff --git a/nptl/pthread_getschedparam.c b/nptl/pthread_getschedparam.c
c6d234
index de81dbc068148ad5..dbff8a984196e6e4 100644
c6d234
--- a/nptl/pthread_getschedparam.c
c6d234
+++ b/nptl/pthread_getschedparam.c
c6d234
@@ -23,10 +23,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_getschedparam (threadid, policy, param)
c6d234
-     pthread_t threadid;
c6d234
-     int *policy;
c6d234
-     struct sched_param *param;
c6d234
+__pthread_getschedparam (pthread_t threadid, int *policy,
c6d234
+			 struct sched_param *param)
c6d234
 {
c6d234
   struct pthread *pd = (struct pthread *) threadid;
c6d234
 
c6d234
diff --git a/nptl/pthread_mutex_setprioceiling.c b/nptl/pthread_mutex_setprioceiling.c
c6d234
index a0dcc7896305daeb..f9b5609bf10cd81a 100644
c6d234
--- a/nptl/pthread_mutex_setprioceiling.c
c6d234
+++ b/nptl/pthread_mutex_setprioceiling.c
c6d234
@@ -23,10 +23,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling)
c6d234
-     pthread_mutex_t *mutex;
c6d234
-     int prioceiling;
c6d234
-     int *old_ceiling;
c6d234
+pthread_mutex_setprioceiling (pthread_mutex_t *mutex, int prioceiling,
c6d234
+			      int *old_ceiling)
c6d234
 {
c6d234
   /* The low bits of __kind aren't ever changed after pthread_mutex_init,
c6d234
      so we don't need a lock yet.  */
c6d234
diff --git a/nptl/pthread_mutexattr_getprioceiling.c b/nptl/pthread_mutexattr_getprioceiling.c
c6d234
index 56d103278dc44c83..2fa97d9024686e24 100644
c6d234
--- a/nptl/pthread_mutexattr_getprioceiling.c
c6d234
+++ b/nptl/pthread_mutexattr_getprioceiling.c
c6d234
@@ -21,9 +21,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_mutexattr_getprioceiling (attr, prioceiling)
c6d234
-     const pthread_mutexattr_t *attr;
c6d234
-     int *prioceiling;
c6d234
+pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *attr,
c6d234
+				  int *prioceiling)
c6d234
 {
c6d234
   const struct pthread_mutexattr *iattr;
c6d234
   int ceiling;
c6d234
diff --git a/nptl/pthread_rwlock_init.c b/nptl/pthread_rwlock_init.c
c6d234
index 2f6c8fad0f262778..0acd59b223984c37 100644
c6d234
--- a/nptl/pthread_rwlock_init.c
c6d234
+++ b/nptl/pthread_rwlock_init.c
c6d234
@@ -29,9 +29,8 @@ static const struct pthread_rwlockattr default_rwlockattr =
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_rwlock_init (rwlock, attr)
c6d234
-     pthread_rwlock_t *rwlock;
c6d234
-     const pthread_rwlockattr_t *attr;
c6d234
+__pthread_rwlock_init (pthread_rwlock_t *rwlock,
c6d234
+		       const pthread_rwlockattr_t *attr)
c6d234
 {
c6d234
   const struct pthread_rwlockattr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_rwlock_timedrdlock.c b/nptl/pthread_rwlock_timedrdlock.c
c6d234
index b7622abfa2478283..59f871d0eebb1202 100644
c6d234
--- a/nptl/pthread_rwlock_timedrdlock.c
c6d234
+++ b/nptl/pthread_rwlock_timedrdlock.c
c6d234
@@ -25,9 +25,8 @@
c6d234
 
c6d234
 /* Try to acquire read lock for RWLOCK or return after specfied time.  */
c6d234
 int
c6d234
-pthread_rwlock_timedrdlock (rwlock, abstime)
c6d234
-     pthread_rwlock_t *rwlock;
c6d234
-     const struct timespec *abstime;
c6d234
+pthread_rwlock_timedrdlock (pthread_rwlock_t *rwlock,
c6d234
+			    const struct timespec *abstime)
c6d234
 {
c6d234
   int result = 0;
c6d234
 
c6d234
diff --git a/nptl/pthread_rwlock_timedwrlock.c b/nptl/pthread_rwlock_timedwrlock.c
c6d234
index 5f2399f91e884b78..e344005f1017384e 100644
c6d234
--- a/nptl/pthread_rwlock_timedwrlock.c
c6d234
+++ b/nptl/pthread_rwlock_timedwrlock.c
c6d234
@@ -25,9 +25,8 @@
c6d234
 
c6d234
 /* Try to acquire write lock for RWLOCK or return after specfied time.	*/
c6d234
 int
c6d234
-pthread_rwlock_timedwrlock (rwlock, abstime)
c6d234
-     pthread_rwlock_t *rwlock;
c6d234
-     const struct timespec *abstime;
c6d234
+pthread_rwlock_timedwrlock (pthread_rwlock_t *rwlock,
c6d234
+			    const struct timespec *abstime)
c6d234
 {
c6d234
   int result = 0;
c6d234
 
c6d234
diff --git a/nptl/pthread_setschedparam.c b/nptl/pthread_setschedparam.c
c6d234
index 15d26b4116bfc1c5..a0fa578821ceea51 100644
c6d234
--- a/nptl/pthread_setschedparam.c
c6d234
+++ b/nptl/pthread_setschedparam.c
c6d234
@@ -24,10 +24,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_setschedparam (threadid, policy, param)
c6d234
-     pthread_t threadid;
c6d234
-     int policy;
c6d234
-     const struct sched_param *param;
c6d234
+__pthread_setschedparam (pthread_t threadid, int policy,
c6d234
+			 const struct sched_param *param)
c6d234
 {
c6d234
   struct pthread *pd = (struct pthread *) threadid;
c6d234
 
c6d234
diff --git a/nptl/sysdeps/pthread/timer_settime.c b/nptl/sysdeps/pthread/timer_settime.c
c6d234
index da0908b0bcad6da7..e86d0a3d231faf09 100644
c6d234
--- a/nptl/sysdeps/pthread/timer_settime.c
c6d234
+++ b/nptl/sysdeps/pthread/timer_settime.c
c6d234
@@ -25,11 +25,8 @@
c6d234
 
c6d234
 /* Set timer TIMERID to VALUE, returning old value in OVLAUE.  */
c6d234
 int
c6d234
-timer_settime (timerid, flags, value, ovalue)
c6d234
-     timer_t timerid;
c6d234
-     int flags;
c6d234
-     const struct itimerspec *value;
c6d234
-     struct itimerspec *ovalue;
c6d234
+timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
c6d234
+	       struct itimerspec *ovalue)
c6d234
 {
c6d234
   struct timer_node *timer;
c6d234
   struct thread_node *thread = NULL;
c6d234
diff --git a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c b/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c
c6d234
index 5e3774fbd4ed3754..2782e93411ce01b8 100644
c6d234
--- a/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c
c6d234
+++ b/nptl/sysdeps/unix/sysv/linux/sparc/pthread_barrier_init.c
c6d234
@@ -21,10 +21,8 @@
c6d234
 #include <lowlevellock.h>
c6d234
 
c6d234
 int
c6d234
-pthread_barrier_init (barrier, attr, count)
c6d234
-     pthread_barrier_t *barrier;
c6d234
-     const pthread_barrierattr_t *attr;
c6d234
-     unsigned int count;
c6d234
+pthread_barrier_init (pthread_barrier_t *barrier,
c6d234
+		      const pthread_barrierattr_t *attr, unsigned int count)
c6d234
 {
c6d234
   union sparc_pthread_barrier *ibarrier;
c6d234
 
c6d234
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_settime.c b/nptl/sysdeps/unix/sysv/linux/timer_settime.c
c6d234
index 5b522ec75040f12c..94acc60a0f86b72c 100644
c6d234
--- a/nptl/sysdeps/unix/sysv/linux/timer_settime.c
c6d234
+++ b/nptl/sysdeps/unix/sysv/linux/timer_settime.c
c6d234
@@ -30,11 +30,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-timer_settime (timerid, flags, value, ovalue)
c6d234
-     timer_t timerid;
c6d234
-     int flags;
c6d234
-     const struct itimerspec *value;
c6d234
-     struct itimerspec *ovalue;
c6d234
+timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
c6d234
+	       struct itimerspec *ovalue)
c6d234
 {
c6d234
 #undef timer_settime
c6d234
   struct timer *kt = (struct timer *) timerid;
c6d234
diff --git a/socket/recvfrom.c b/socket/recvfrom.c
c6d234
index b99774f368501b55..f652b1478b7a6e32 100644
c6d234
--- a/socket/recvfrom.c
c6d234
+++ b/socket/recvfrom.c
c6d234
@@ -22,13 +22,8 @@
c6d234
    at address ADDR (which is ADDR_LEN bytes long).
c6d234
    Returns the number read or -1 for errors.  */
c6d234
 ssize_t
c6d234
-__recvfrom (fd, buf, n, flags, addr, addr_len)
c6d234
-     int fd;
c6d234
-     void *buf;
c6d234
-     size_t n;
c6d234
-     int flags;
c6d234
-     __SOCKADDR_ARG addr;
c6d234
-     socklen_t *addr_len;
c6d234
+__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addr,
c6d234
+	    socklen_t *addr_len)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/socket/sendto.c b/socket/sendto.c
c6d234
index ae06a54cc6947a7f..090fd000799c9347 100644
c6d234
--- a/socket/sendto.c
c6d234
+++ b/socket/sendto.c
c6d234
@@ -21,13 +21,8 @@
c6d234
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
c6d234
    ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.  */
c6d234
 ssize_t
c6d234
-__sendto (fd, buf, n, flags, addr, addr_len)
c6d234
-     int fd;
c6d234
-     const __ptr_t buf;
c6d234
-     size_t n;
c6d234
-     int flags;
c6d234
-     __CONST_SOCKADDR_ARG addr;
c6d234
-     socklen_t addr_len;
c6d234
+__sendto (int fd, const __ptr_t buf, size_t n, int flags,
c6d234
+	  __CONST_SOCKADDR_ARG addr, socklen_t addr_len)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/socket/setsockopt.c b/socket/setsockopt.c
c6d234
index 9e1e7a3d800b4bdb..bf08491d63ff2292 100644
c6d234
--- a/socket/setsockopt.c
c6d234
+++ b/socket/setsockopt.c
c6d234
@@ -22,12 +22,8 @@
c6d234
    to *OPTVAL (which is OPTLEN bytes long).
c6d234
    Returns 0 on success, -1 for errors.  */
c6d234
 int
c6d234
-__setsockopt (fd, level, optname, optval, optlen)
c6d234
-     int fd;
c6d234
-     int level;
c6d234
-     int optname;
c6d234
-     const __ptr_t optval;
c6d234
-     socklen_t optlen;
c6d234
+__setsockopt (int fd, int level, int optname, const __ptr_t optval,
c6d234
+	      socklen_t optlen)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/stdio-common/_itoa.c b/stdio-common/_itoa.c
c6d234
index 67592318866b553e..dbf4c7c72f1173c8 100644
c6d234
--- a/stdio-common/_itoa.c
c6d234
+++ b/stdio-common/_itoa.c
c6d234
@@ -191,11 +191,8 @@ _itoa_word (_ITOA_WORD_TYPE value, char *buflim,
c6d234
 
c6d234
 #if _ITOA_NEEDED
c6d234
 char *
c6d234
-_itoa (value, buflim, base, upper_case)
c6d234
-     unsigned long long int value;
c6d234
-     char *buflim;
c6d234
-     unsigned int base;
c6d234
-     int upper_case;
c6d234
+_itoa (unsigned long long int value, char *buflim, unsigned int base,
c6d234
+       int upper_case)
c6d234
 {
c6d234
   const char *digits = (upper_case
c6d234
 			? _itoa_upper_digits
c6d234
diff --git a/stdio-common/_itowa.c b/stdio-common/_itowa.c
c6d234
index f50893dfcd79ea33..0cf3f773806dfc67 100644
c6d234
--- a/stdio-common/_itowa.c
c6d234
+++ b/stdio-common/_itowa.c
c6d234
@@ -87,11 +87,8 @@ extern const wchar_t _itowa_upper_digits[] attribute_hidden;
c6d234
 
c6d234
 #if _ITOA_NEEDED
c6d234
 wchar_t *
c6d234
-_itowa (value, buflim, base, upper_case)
c6d234
-     unsigned long long int value;
c6d234
-     wchar_t *buflim;
c6d234
-     unsigned int base;
c6d234
-     int upper_case;
c6d234
+_itowa (unsigned long long int value, wchar_t *buflim, unsigned int base,
c6d234
+	int upper_case)
c6d234
 {
c6d234
   const wchar_t *digits = (upper_case
c6d234
 			   ? _itowa_upper_digits : _itowa_lower_digits);
c6d234
diff --git a/stdio-common/reg-printf.c b/stdio-common/reg-printf.c
c6d234
index 30bf7dadd6343874..90d8558fca86196e 100644
c6d234
--- a/stdio-common/reg-printf.c
c6d234
+++ b/stdio-common/reg-printf.c
c6d234
@@ -38,10 +38,8 @@ int __register_printf_function (int, printf_function,
c6d234
 
c6d234
 /* Register FUNC to be called to format SPEC specifiers.  */
c6d234
 int
c6d234
-__register_printf_specifier (spec, converter, arginfo)
c6d234
-     int spec;
c6d234
-     printf_function converter;
c6d234
-     printf_arginfo_size_function arginfo;
c6d234
+__register_printf_specifier (int spec, printf_function converter,
c6d234
+			     printf_arginfo_size_function arginfo)
c6d234
 {
c6d234
   if (spec < 0 || spec > (int) UCHAR_MAX)
c6d234
     {
c6d234
@@ -79,10 +77,8 @@ weak_alias (__register_printf_specifier, register_printf_specifier)
c6d234
 
c6d234
 /* Register FUNC to be called to format SPEC specifiers.  */
c6d234
 int
c6d234
-__register_printf_function (spec, converter, arginfo)
c6d234
-     int spec;
c6d234
-     printf_function converter;
c6d234
-     printf_arginfo_function arginfo;
c6d234
+__register_printf_function (int spec, printf_function converter,
c6d234
+			    printf_arginfo_function arginfo)
c6d234
 {
c6d234
   return __register_printf_specifier (spec, converter,
c6d234
 				      (printf_arginfo_size_function*) arginfo);
c6d234
diff --git a/stdio-common/tempname.c b/stdio-common/tempname.c
c6d234
index d600e3708d86be6c..23b64e624b11765e 100644
c6d234
--- a/stdio-common/tempname.c
c6d234
+++ b/stdio-common/tempname.c
c6d234
@@ -24,12 +24,8 @@
c6d234
    template suitable for use in __gen_tempname into TMPL, bounded
c6d234
    by TMPL_LEN. */
c6d234
 int
c6d234
-__path_search (tmpl, tmpl_len, dir, pfx, try_tmpdir)
c6d234
-     char *tmpl;
c6d234
-     size_t tmpl_len;
c6d234
-     const char *dir;
c6d234
-     const char *pfx;
c6d234
-     int try_tmpdir;
c6d234
+__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
c6d234
+	       int try_tmpdir)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/stdlib/addmul_1.c b/stdlib/addmul_1.c
c6d234
index 8e8342a07ff3ad5f..276a379bef7d9bf0 100644
c6d234
--- a/stdlib/addmul_1.c
c6d234
+++ b/stdlib/addmul_1.c
c6d234
@@ -26,11 +26,8 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
c6d234
 #include "longlong.h"
c6d234
 
c6d234
 mp_limb_t
c6d234
-mpn_addmul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
c6d234
-     register mp_ptr res_ptr;
c6d234
-     register mp_srcptr s1_ptr;
c6d234
-     mp_size_t s1_size;
c6d234
-     register mp_limb_t s2_limb;
c6d234
+mpn_addmul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,
c6d234
+	      mp_size_t s1_size, register mp_limb_t s2_limb)
c6d234
 {
c6d234
   register mp_limb_t cy_limb;
c6d234
   register mp_size_t j;
c6d234
diff --git a/stdlib/mul_1.c b/stdlib/mul_1.c
c6d234
index 87ab98189aef442a..9e7fcf6f27ec779e 100644
c6d234
--- a/stdlib/mul_1.c
c6d234
+++ b/stdlib/mul_1.c
c6d234
@@ -24,11 +24,8 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
c6d234
 #include "longlong.h"
c6d234
 
c6d234
 mp_limb_t
c6d234
-mpn_mul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
c6d234
-     register mp_ptr res_ptr;
c6d234
-     register mp_srcptr s1_ptr;
c6d234
-     mp_size_t s1_size;
c6d234
-     register mp_limb_t s2_limb;
c6d234
+mpn_mul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,
c6d234
+	   mp_size_t s1_size, register mp_limb_t s2_limb)
c6d234
 {
c6d234
   register mp_limb_t cy_limb;
c6d234
   register mp_size_t j;
c6d234
diff --git a/stdlib/random_r.c b/stdlib/random_r.c
c6d234
index 5fdf56275601075d..1c9addd32395a99c 100644
c6d234
--- a/stdlib/random_r.c
c6d234
+++ b/stdlib/random_r.c
c6d234
@@ -227,11 +227,8 @@ weak_alias (__srandom_r, srandom_r)
c6d234
    setstate so that it doesn't matter when initstate is called.
c6d234
    Returns 0 on success, non-zero on failure.  */
c6d234
 int
c6d234
-__initstate_r (seed, arg_state, n, buf)
c6d234
-     unsigned int seed;
c6d234
-     char *arg_state;
c6d234
-     size_t n;
c6d234
-     struct random_data *buf;
c6d234
+__initstate_r (unsigned int seed, char *arg_state, size_t n,
c6d234
+	       struct random_data *buf)
c6d234
 {
c6d234
   if (buf == NULL)
c6d234
     goto fail;
c6d234
diff --git a/stdlib/setenv.c b/stdlib/setenv.c
c6d234
index 1a4d3c203e90ff83..45efe2e3f2b157ab 100644
c6d234
--- a/stdlib/setenv.c
c6d234
+++ b/stdlib/setenv.c
c6d234
@@ -106,11 +106,8 @@ static char **last_environ;
c6d234
    to reuse values once generated for a `setenv' call since we can never
c6d234
    free the strings.  */
c6d234
 int
c6d234
-__add_to_environ (name, value, combined, replace)
c6d234
-     const char *name;
c6d234
-     const char *value;
c6d234
-     const char *combined;
c6d234
-     int replace;
c6d234
+__add_to_environ (const char *name, const char *value, const char *combined,
c6d234
+		  int replace)
c6d234
 {
c6d234
   char **ep;
c6d234
   size_t size;
c6d234
diff --git a/stdlib/submul_1.c b/stdlib/submul_1.c
c6d234
index 9eafe7e00b93bff3..8cad60307c3d8c75 100644
c6d234
--- a/stdlib/submul_1.c
c6d234
+++ b/stdlib/submul_1.c
c6d234
@@ -26,11 +26,8 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
c6d234
 #include "longlong.h"
c6d234
 
c6d234
 mp_limb_t
c6d234
-mpn_submul_1 (res_ptr, s1_ptr, s1_size, s2_limb)
c6d234
-     register mp_ptr res_ptr;
c6d234
-     register mp_srcptr s1_ptr;
c6d234
-     mp_size_t s1_size;
c6d234
-     register mp_limb_t s2_limb;
c6d234
+mpn_submul_1 (register mp_ptr res_ptr, register mp_srcptr s1_ptr,
c6d234
+	      mp_size_t s1_size, register mp_limb_t s2_limb)
c6d234
 {
c6d234
   register mp_limb_t cy_limb;
c6d234
   register mp_size_t j;
c6d234
diff --git a/streams/getpmsg.c b/streams/getpmsg.c
c6d234
index acb25b585f5aedb2..05d90d0801c8590d 100644
c6d234
--- a/streams/getpmsg.c
c6d234
+++ b/streams/getpmsg.c
c6d234
@@ -19,12 +19,8 @@
c6d234
 #include <stropts.h>
c6d234
 
c6d234
 int
c6d234
-getpmsg (fildes, ctlptr, dataptr, bandp, flagsp)
c6d234
-     int fildes;
c6d234
-     struct strbuf *ctlptr;
c6d234
-     struct strbuf *dataptr;
c6d234
-     int *bandp;
c6d234
-     int *flagsp;
c6d234
+getpmsg (int fildes, struct strbuf *ctlptr, struct strbuf *dataptr, int *bandp,
c6d234
+	 int *flagsp)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/streams/putmsg.c b/streams/putmsg.c
c6d234
index 2d776bc96ab737b6..814e2a7e8c7d61a0 100644
c6d234
--- a/streams/putmsg.c
c6d234
+++ b/streams/putmsg.c
c6d234
@@ -19,11 +19,8 @@
c6d234
 #include <stropts.h>
c6d234
 
c6d234
 int
c6d234
-putmsg (fildes, ctlptr, dataptr, flags)
c6d234
-     int fildes;
c6d234
-     const struct strbuf *ctlptr;
c6d234
-     const struct strbuf *dataptr;
c6d234
-     int flags;
c6d234
+putmsg (int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr,
c6d234
+	int flags)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/streams/putpmsg.c b/streams/putpmsg.c
c6d234
index c2fa820e6f2adf5b..fb9bfebf2072ecf9 100644
c6d234
--- a/streams/putpmsg.c
c6d234
+++ b/streams/putpmsg.c
c6d234
@@ -19,12 +19,8 @@
c6d234
 #include <stropts.h>
c6d234
 
c6d234
 int
c6d234
-putpmsg (fildes, ctlptr, dataptr, band, flags)
c6d234
-     int fildes;
c6d234
-     const struct strbuf *ctlptr;
c6d234
-     const struct strbuf *dataptr;
c6d234
-     int band;
c6d234
-     int flags;
c6d234
+putpmsg (int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr,
c6d234
+	 int band, int flags)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/sunrpc/clnt_raw.c b/sunrpc/clnt_raw.c
c6d234
index 6653ee42fbc9edbe..a149bf419b1b1d09 100644
c6d234
--- a/sunrpc/clnt_raw.c
c6d234
+++ b/sunrpc/clnt_raw.c
c6d234
@@ -132,14 +132,8 @@ clntraw_create (u_long prog, u_long vers)
c6d234
 libc_hidden_nolink_sunrpc (clntraw_create, GLIBC_2_0)
c6d234
 
c6d234
 static enum clnt_stat
c6d234
-clntraw_call (h, proc, xargs, argsp, xresults, resultsp, timeout)
c6d234
-     CLIENT *h;
c6d234
-     u_long proc;
c6d234
-     xdrproc_t xargs;
c6d234
-     caddr_t argsp;
c6d234
-     xdrproc_t xresults;
c6d234
-     caddr_t resultsp;
c6d234
-     struct timeval timeout;
c6d234
+clntraw_call (CLIENT *h, u_long proc, xdrproc_t xargs, caddr_t argsp,
c6d234
+	      xdrproc_t xresults, caddr_t resultsp, struct timeval timeout)
c6d234
 {
c6d234
   struct clntraw_private_s *clp = clntraw_private;
c6d234
   XDR *xdrs = &clp->xdr_stream;
c6d234
diff --git a/sunrpc/clnt_tcp.c b/sunrpc/clnt_tcp.c
c6d234
index 901820397dd56cd6..99a7101d3ac816fb 100644
c6d234
--- a/sunrpc/clnt_tcp.c
c6d234
+++ b/sunrpc/clnt_tcp.c
c6d234
@@ -224,14 +224,9 @@ libc_hidden_nolink_sunrpc (clnttcp_create, GLIBC_2_0)
c6d234
 #endif
c6d234
 
c6d234
 static enum clnt_stat
c6d234
-clnttcp_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
c6d234
-     CLIENT *h;
c6d234
-     u_long proc;
c6d234
-     xdrproc_t xdr_args;
c6d234
-     caddr_t args_ptr;
c6d234
-     xdrproc_t xdr_results;
c6d234
-     caddr_t results_ptr;
c6d234
-     struct timeval timeout;
c6d234
+clnttcp_call (CLIENT *h, u_long proc, xdrproc_t xdr_args, caddr_t args_ptr,
c6d234
+	      xdrproc_t xdr_results, caddr_t results_ptr,
c6d234
+	      struct timeval timeout)
c6d234
 {
c6d234
   struct ct_data *ct = (struct ct_data *) h->cl_private;
c6d234
   XDR *xdrs = &(ct->ct_xdrs);
c6d234
diff --git a/sunrpc/clnt_udp.c b/sunrpc/clnt_udp.c
c6d234
index 808603c827af6f98..1e0c7d45d33d23a1 100644
c6d234
--- a/sunrpc/clnt_udp.c
c6d234
+++ b/sunrpc/clnt_udp.c
c6d234
@@ -256,12 +256,8 @@ clntudp_bufcreate (struct sockaddr_in *raddr, u_long program, u_long version,
c6d234
 libc_hidden_nolink_sunrpc (clntudp_bufcreate, GLIBC_2_0)
c6d234
 
c6d234
 CLIENT *
c6d234
-clntudp_create (raddr, program, version, wait, sockp)
c6d234
-     struct sockaddr_in *raddr;
c6d234
-     u_long program;
c6d234
-     u_long version;
c6d234
-     struct timeval wait;
c6d234
-     int *sockp;
c6d234
+clntudp_create (struct sockaddr_in *raddr, u_long program, u_long version,
c6d234
+		struct timeval wait, int *sockp)
c6d234
 {
c6d234
   return __libc_clntudp_bufcreate (raddr, program, version, wait,
c6d234
 				   sockp, UDPMSGSIZE, UDPMSGSIZE, 0);
c6d234
diff --git a/sunrpc/clnt_unix.c b/sunrpc/clnt_unix.c
c6d234
index 084669dea6819e7c..3e008353b56cf437 100644
c6d234
--- a/sunrpc/clnt_unix.c
c6d234
+++ b/sunrpc/clnt_unix.c
c6d234
@@ -203,14 +203,9 @@ fooy:
c6d234
 libc_hidden_nolink_sunrpc (clntunix_create, GLIBC_2_1)
c6d234
 
c6d234
 static enum clnt_stat
c6d234
-clntunix_call (h, proc, xdr_args, args_ptr, xdr_results, results_ptr, timeout)
c6d234
-     CLIENT *h;
c6d234
-     u_long proc;
c6d234
-     xdrproc_t xdr_args;
c6d234
-     caddr_t args_ptr;
c6d234
-     xdrproc_t xdr_results;
c6d234
-     caddr_t results_ptr;
c6d234
-     struct timeval timeout;
c6d234
+clntunix_call (CLIENT *h, u_long proc, xdrproc_t xdr_args, caddr_t args_ptr,
c6d234
+	       xdrproc_t xdr_results, caddr_t results_ptr,
c6d234
+	       struct timeval timeout)
c6d234
 {
c6d234
   struct ct_data *ct = (struct ct_data *) h->cl_private;
c6d234
   XDR *xdrs = &(ct->ct_xdrs);
c6d234
diff --git a/sunrpc/pm_getport.c b/sunrpc/pm_getport.c
c6d234
index f10f87250d2784d7..5c43acc0609d7377 100644
c6d234
--- a/sunrpc/pm_getport.c
c6d234
+++ b/sunrpc/pm_getport.c
c6d234
@@ -152,11 +152,8 @@ libc_hidden_nolink_sunrpc (__libc_rpc_getport, GLIBC_PRIVATE)
c6d234
  * Returns 0 if no map exists.
c6d234
  */
c6d234
 u_short
c6d234
-pmap_getport (address, program, version, protocol)
c6d234
-     struct sockaddr_in *address;
c6d234
-     u_long program;
c6d234
-     u_long version;
c6d234
-     u_int protocol;
c6d234
+pmap_getport (struct sockaddr_in *address, u_long program, u_long version,
c6d234
+	      u_int protocol)
c6d234
 {
c6d234
   return __libc_rpc_getport (address, program, version, protocol, 5, 60);
c6d234
 }
c6d234
diff --git a/sunrpc/svc_udp.c b/sunrpc/svc_udp.c
c6d234
index e99c97680676f509..d1c8788d20b6805c 100644
c6d234
--- a/sunrpc/svc_udp.c
c6d234
+++ b/sunrpc/svc_udp.c
c6d234
@@ -585,11 +585,8 @@ cache_set (SVCXPRT *xprt, u_long replylen)
c6d234
  * return 1 if found, 0 if not found
c6d234
  */
c6d234
 static int
c6d234
-cache_get (xprt, msg, replyp, replylenp)
c6d234
-     SVCXPRT *xprt;
c6d234
-     struct rpc_msg *msg;
c6d234
-     char **replyp;
c6d234
-     u_long *replylenp;
c6d234
+cache_get (SVCXPRT *xprt, struct rpc_msg *msg, char **replyp,
c6d234
+	   u_long *replylenp)
c6d234
 {
c6d234
   u_int loc;
c6d234
   cache_ptr ent;
c6d234
diff --git a/sunrpc/xdr_array.c b/sunrpc/xdr_array.c
c6d234
index a6348612788cf338..fd9d1fb42f744844 100644
c6d234
--- a/sunrpc/xdr_array.c
c6d234
+++ b/sunrpc/xdr_array.c
c6d234
@@ -141,12 +141,8 @@ libc_hidden_nolink_sunrpc (xdr_array, GLIBC_2_0)
c6d234
  * > xdr_elem: routine to XDR each element
c6d234
  */
c6d234
 bool_t
c6d234
-xdr_vector (xdrs, basep, nelem, elemsize, xdr_elem)
c6d234
-     XDR *xdrs;
c6d234
-     char *basep;
c6d234
-     u_int nelem;
c6d234
-     u_int elemsize;
c6d234
-     xdrproc_t xdr_elem;
c6d234
+xdr_vector (XDR *xdrs, char *basep, u_int nelem, u_int elemsize,
c6d234
+	    xdrproc_t xdr_elem)
c6d234
 {
c6d234
   u_int i;
c6d234
   char *elptr;
c6d234
diff --git a/sysdeps/mach/hurd/getcwd.c b/sysdeps/mach/hurd/getcwd.c
c6d234
index 6945e4d1c5c12237..16a3a6e3a112d9fd 100644
c6d234
--- a/sysdeps/mach/hurd/getcwd.c
c6d234
+++ b/sysdeps/mach/hurd/getcwd.c
c6d234
@@ -285,10 +285,8 @@ _hurd_canonicalize_directory_name_internal (file_t thisdir,
c6d234
 }
c6d234
 
c6d234
 char *
c6d234
-__canonicalize_directory_name_internal (thisdir, buf, size)
c6d234
-     const char *thisdir;
c6d234
-     char *buf;
c6d234
-     size_t size;
c6d234
+__canonicalize_directory_name_internal (const char *thisdir, char *buf,
c6d234
+					size_t size)
c6d234
 {
c6d234
   char *result;
c6d234
   file_t port = __file_name_lookup (thisdir, 0, 0);
c6d234
diff --git a/sysdeps/mach/hurd/pselect.c b/sysdeps/mach/hurd/pselect.c
c6d234
index ada99094e4e0a44d..90287f6a6dd898db 100644
c6d234
--- a/sysdeps/mach/hurd/pselect.c
c6d234
+++ b/sysdeps/mach/hurd/pselect.c
c6d234
@@ -30,13 +30,8 @@
c6d234
    SIGMASK for this call.  Returns the number of ready descriptors, or -1 for
c6d234
    errors.  */
c6d234
 int
c6d234
-__pselect (nfds, readfds, writefds, exceptfds, timeout, sigmask)
c6d234
-     int nfds;
c6d234
-     fd_set *readfds;
c6d234
-     fd_set *writefds;
c6d234
-     fd_set *exceptfds;
c6d234
-     const struct timespec *timeout;
c6d234
-     const sigset_t *sigmask;
c6d234
+__pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
c6d234
+	   const struct timespec *timeout, const sigset_t *sigmask)
c6d234
 {
c6d234
   return _hurd_select (nfds, NULL,
c6d234
 		       readfds, writefds, exceptfds, timeout, sigmask);
c6d234
diff --git a/sysdeps/mach/hurd/recvfrom.c b/sysdeps/mach/hurd/recvfrom.c
c6d234
index 3a094aa0d2c9fda1..cde89fdcfb56ca0b 100644
c6d234
--- a/sysdeps/mach/hurd/recvfrom.c
c6d234
+++ b/sysdeps/mach/hurd/recvfrom.c
c6d234
@@ -27,13 +27,8 @@
c6d234
    the sender, and store the actual size of the address in *ADDR_LEN.
c6d234
    Returns the number of bytes read or -1 for errors.  */
c6d234
 ssize_t
c6d234
-__recvfrom (fd, buf, n, flags, addrarg, addr_len)
c6d234
-     int fd;
c6d234
-     void *buf;
c6d234
-     size_t n;
c6d234
-     int flags;
c6d234
-     __SOCKADDR_ARG addrarg;
c6d234
-     socklen_t *addr_len;
c6d234
+__recvfrom (int fd, void *buf, size_t n, int flags, __SOCKADDR_ARG addrarg,
c6d234
+	    socklen_t *addr_len)
c6d234
 {
c6d234
   error_t err;
c6d234
   mach_port_t addrport;
c6d234
diff --git a/sysdeps/mach/hurd/select.c b/sysdeps/mach/hurd/select.c
c6d234
index e679637d95b18033..22f6e3b221fb8d82 100644
c6d234
--- a/sysdeps/mach/hurd/select.c
c6d234
+++ b/sysdeps/mach/hurd/select.c
c6d234
@@ -26,12 +26,8 @@
c6d234
    after waiting the interval specified therein.  Returns the number of ready
c6d234
    descriptors, or -1 for errors.  */
c6d234
 int
c6d234
-__select (nfds, readfds, writefds, exceptfds, timeout)
c6d234
-     int nfds;
c6d234
-     fd_set *readfds;
c6d234
-     fd_set *writefds;
c6d234
-     fd_set *exceptfds;
c6d234
-     struct timeval *timeout;
c6d234
+__select (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
c6d234
+	  struct timeval *timeout)
c6d234
 {
c6d234
   struct timespec ts, *to;
c6d234
 
c6d234
diff --git a/sysdeps/posix/ttyname_r.c b/sysdeps/posix/ttyname_r.c
c6d234
index bf8399d36d0e4541..7d2701da33c08624 100644
c6d234
--- a/sysdeps/posix/ttyname_r.c
c6d234
+++ b/sysdeps/posix/ttyname_r.c
c6d234
@@ -37,14 +37,8 @@ static int getttyname_r (int fd, char *buf, size_t buflen,
c6d234
 
c6d234
 static int
c6d234
 internal_function
c6d234
-getttyname_r (fd, buf, buflen, mydev, myino, save, dostat)
c6d234
-     int fd;
c6d234
-     char *buf;
c6d234
-     size_t buflen;
c6d234
-     dev_t mydev;
c6d234
-     ino_t myino;
c6d234
-     int save;
c6d234
-     int *dostat;
c6d234
+getttyname_r (int fd, char *buf, size_t buflen, dev_t mydev, ino_t myino,
c6d234
+	      int save, int *dostat)
c6d234
 {
c6d234
   struct stat st;
c6d234
   DIR *dirstream;
c6d234
diff --git a/sysdeps/unix/sysv/linux/i386/putmsg.c b/sysdeps/unix/sysv/linux/i386/putmsg.c
c6d234
index a413d8ce77d2f35d..84d54744c6d38c9f 100644
c6d234
--- a/sysdeps/unix/sysv/linux/i386/putmsg.c
c6d234
+++ b/sysdeps/unix/sysv/linux/i386/putmsg.c
c6d234
@@ -24,11 +24,8 @@
c6d234
 
c6d234
 #ifdef __NR_putpmsg
c6d234
 int
c6d234
-putmsg (fildes, ctlptr, dataptr, flags)
c6d234
-     int fildes;
c6d234
-     const struct strbuf *ctlptr;
c6d234
-     const struct strbuf *dataptr;
c6d234
-     int flags;
c6d234
+putmsg (int fildes, const struct strbuf *ctlptr, const struct strbuf *dataptr,
c6d234
+	int flags)
c6d234
 {
c6d234
   return INLINE_SYSCALL (putpmsg, 5, fildes, ctlptr, dataptr, -1, flags);
c6d234
 }
c6d234
diff --git a/sysdeps/unix/sysv/linux/s390/semtimedop.c b/sysdeps/unix/sysv/linux/s390/semtimedop.c
c6d234
index 53b82324dcb9f7e4..5628171762561c2e 100644
c6d234
--- a/sysdeps/unix/sysv/linux/s390/semtimedop.c
c6d234
+++ b/sysdeps/unix/sysv/linux/s390/semtimedop.c
c6d234
@@ -26,11 +26,8 @@
c6d234
 /* Perform user-defined atomical operation of array of semaphores.  */
c6d234
 
c6d234
 int
c6d234
-semtimedop (semid, sops, nsops, timeout)
c6d234
-     int semid;
c6d234
-     struct sembuf *sops;
c6d234
-     size_t nsops;
c6d234
-     const struct timespec *timeout;
c6d234
+semtimedop (int semid, struct sembuf *sops, size_t nsops,
c6d234
+	    const struct timespec *timeout)
c6d234
 {
c6d234
   return INLINE_SYSCALL (ipc, 5, IPCOP_semtimedop,
c6d234
 			 semid, (int) nsops, timeout, sops);
c6d234
diff --git a/sysdeps/unix/sysv/linux/semtimedop.c b/sysdeps/unix/sysv/linux/semtimedop.c
c6d234
index 5a43f53975aeafcc..f9f04f5d28def4e1 100644
c6d234
--- a/sysdeps/unix/sysv/linux/semtimedop.c
c6d234
+++ b/sysdeps/unix/sysv/linux/semtimedop.c
c6d234
@@ -26,11 +26,8 @@
c6d234
 /* Perform user-defined atomical operation of array of semaphores.  */
c6d234
 
c6d234
 int
c6d234
-semtimedop (semid, sops, nsops, timeout)
c6d234
-     int semid;
c6d234
-     struct sembuf *sops;
c6d234
-     size_t nsops;
c6d234
-     const struct timespec *timeout;
c6d234
+semtimedop (int semid, struct sembuf *sops, size_t nsops,
c6d234
+	    const struct timespec *timeout)
c6d234
 {
c6d234
   return INLINE_SYSCALL (ipc, 6, IPCOP_semtimedop,
c6d234
 			 semid, (int) nsops, 0, sops,
c6d234
diff --git a/sysvipc/semtimedop.c b/sysvipc/semtimedop.c
c6d234
index e7c631ac94e12f6a..5d776fe2d01f8438 100644
c6d234
--- a/sysvipc/semtimedop.c
c6d234
+++ b/sysvipc/semtimedop.c
c6d234
@@ -22,11 +22,8 @@
c6d234
 /* Perform user-defined atomical operation of array of semaphores.  */
c6d234
 
c6d234
 int
c6d234
-semtimedop (semid, sops, nsops, timeout)
c6d234
-     int semid;
c6d234
-     struct sembuf *sops;
c6d234
-     size_t nsops;
c6d234
-     const struct timespec *timeout;
c6d234
+semtimedop (int semid, struct sembuf *sops, size_t nsops,
c6d234
+	    const struct timespec *timeout)
c6d234
 {
c6d234
   __set_errno (ENOSYS);
c6d234
   return -1;
c6d234
diff --git a/time/setitimer.c b/time/setitimer.c
c6d234
index 40880f8210adc6b8..903558767fbad824 100644
c6d234
--- a/time/setitimer.c
c6d234
+++ b/time/setitimer.c
c6d234
@@ -23,10 +23,8 @@
c6d234
    set *OLD to the old value of timer WHICH.
c6d234
    Returns 0 on success, -1 on errors.  */
c6d234
 int
c6d234
-__setitimer (which, new, old)
c6d234
-     enum __itimer_which which;
c6d234
-     const struct itimerval *new;
c6d234
-     struct itimerval *old;
c6d234
+__setitimer (enum __itimer_which which, const struct itimerval *new,
c6d234
+	     struct itimerval *old)
c6d234
 {
c6d234
   if (new == NULL)
c6d234
     {
c6d234
diff --git a/time/strftime_l.c b/time/strftime_l.c
c6d234
index 873605720b837b15..0f6ac83d34d43755 100644
c6d234
--- a/time/strftime_l.c
c6d234
+++ b/time/strftime_l.c
c6d234
@@ -1438,11 +1438,8 @@ __strftime_internal (s, maxsize, format, tp, tzset_called ut_argument
c6d234
    strftime function and does not have the extra information whether the
c6d234
    TP arguments comes from a `gmtime' call or not.  */
c6d234
 size_t
c6d234
-emacs_strftime (s, maxsize, format, tp)
c6d234
-      char *s;
c6d234
-      size_t maxsize;
c6d234
-      const char *format;
c6d234
-      const struct tm *tp;
c6d234
+emacs_strftime (char *s, size_t maxsize, const char *format,
c6d234
+		const struct tm *tp)
c6d234
 {
c6d234
   return my_strftime (s, maxsize, format, tp, 0);
c6d234
 }