commit 9dd346ff431fc761f1b748bd4da8bb59f7652094

Author: Joseph Myers <joseph@codesourcery.com>

Date:   Tue Oct 20 11:54:09 2015 +0000

    Convert 113 more function definitions to prototype style (files with assertions).

    This mostly automatically-generated patch converts 113 function

    definitions in glibc from old-style K&R to prototype-style.  Following

    my other recent such patches, this one deals with the case of function

    definitions in files that either contain assertions or where grep

    suggested they might contain assertions - and thus where it isn't

    possible to use a simple object code comparison as a sanity check on

    the correctness of the patch, because line numbers are changed.

    A few such automatically-generated changes needed to be supplemented

    by manual changes for the result to compile.  openat64 had a prototype

    declaration with "..." but an old-style definition in

    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the

    generated prototype in the definition (I've filed

    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing

    such cases in GCC; the old state was undefined behavior not requiring

    a diagnostic, but one seems a good idea).  In addition, as Florian has

    noted regparm attribute mismatches between declaration and definition

    are only diagnosed for prototype definitions, and five functions

    needed internal_function added to their definitions (in the case of

    __pthread_mutex_cond_lock, via the macro definition of

    __pthread_mutex_lock) to compile on i386.

    After this patch is in, remaining old-style definitions are probably

    most readily fixed manually before we can turn on

    -Wold-style-definition for all builds.

    Tested for x86_64 and x86 (testsuite).

            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style

            function definition.

            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.

            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.

            * debug/backtracesyms.c (__backtrace_symbols): Likewise.

            * elf/dl-minimal.c (_itoa): Likewise.

            * hurd/hurdmalloc.c (malloc): Likewise.

            (free): Likewise.

            (realloc): Likewise.

            * inet/inet6_option.c (inet6_option_space): Likewise.

            (inet6_option_init): Likewise.

            (inet6_option_append): Likewise.

            (inet6_option_alloc): Likewise.

            (inet6_option_next): Likewise.

            (inet6_option_find): Likewise.

            * io/ftw.c (FTW_NAME): Likewise.

            (NFTW_NAME): Likewise.

            (NFTW_NEW_NAME): Likewise.

            (NFTW_OLD_NAME): Likewise.

            * libio/iofwide.c (_IO_fwide): Likewise.

            * libio/strops.c (_IO_str_init_static_internal): Likewise.

            (_IO_str_init_static): Likewise.

            (_IO_str_init_readonly): Likewise.

            (_IO_str_overflow): Likewise.

            (_IO_str_underflow): Likewise.

            (_IO_str_count): Likewise.

            (_IO_str_seekoff): Likewise.

            (_IO_str_pbackfail): Likewise.

            (_IO_str_finish): Likewise.

            * libio/wstrops.c (_IO_wstr_init_static): Likewise.

            (_IO_wstr_overflow): Likewise.

            (_IO_wstr_underflow): Likewise.

            (_IO_wstr_count): Likewise.

            (_IO_wstr_seekoff): Likewise.

            (_IO_wstr_pbackfail): Likewise.

            (_IO_wstr_finish): Likewise.

            * locale/programs/localedef.c (normalize_codeset): Likewise.

            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.

            (add_locales_to_archive): Likewise.

            (delete_locales_from_archive): Likewise.

            * malloc/malloc.c (__libc_mallinfo): Likewise.

            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.

            * misc/tsearch.c (__tfind): Likewise.

            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.

            * nptl/pthread_attr_getdetachstate.c

            (__pthread_attr_getdetachstate): Likewise.

            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):

            Likewise.

            * nptl/pthread_attr_getinheritsched.c

            (__pthread_attr_getinheritsched): Likewise.

            * nptl/pthread_attr_getschedparam.c

            (__pthread_attr_getschedparam): Likewise.

            * nptl/pthread_attr_getschedpolicy.c

            (__pthread_attr_getschedpolicy): Likewise.

            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):

            Likewise.

            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):

            Likewise.

            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):

            Likewise.

            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):

            Likewise.

            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.

            (__pthread_attr_init_2_0): Likewise.

            * nptl/pthread_attr_setdetachstate.c

            (__pthread_attr_setdetachstate): Likewise.

            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):

            Likewise.

            * nptl/pthread_attr_setinheritsched.c

            (__pthread_attr_setinheritsched): Likewise.

            * nptl/pthread_attr_setschedparam.c

            (__pthread_attr_setschedparam): Likewise.

            * nptl/pthread_attr_setschedpolicy.c

            (__pthread_attr_setschedpolicy): Likewise.

            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):

            Likewise.

            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):

            Likewise.

            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):

            Likewise.

            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):

            Likewise.

            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):

            Likewise.

            * nptl/pthread_create.c (__find_in_stack_list): Likewise.

            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.

            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to

            use internal_function.

            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to

            prototype-style function definition.

            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.

            (__pthread_mutex_cond_lock_adjust): Likewise.  Use

            internal_function.

            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):

            Convert to prototype-style function definition.

            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):

            Likewise.

            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):

            Likewise.

            (__pthread_mutex_unlock): Likewise.

            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.

            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.

            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.

            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.

            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.

            * nss/makedb.c (process_input): Likewise.

            * posix/fnmatch.c (__strchrnul): Likewise.

            (__wcschrnul): Likewise.

            (fnmatch): Likewise.

            * posix/fnmatch_loop.c (FCT): Likewise.

            * posix/glob.c (globfree): Likewise.

            (__glob_pattern_type): Likewise.

            (__glob_pattern_p): Likewise.

            * posix/regcomp.c (re_compile_pattern): Likewise.

            (re_set_syntax): Likewise.

            (re_compile_fastmap): Likewise.

            (regcomp): Likewise.

            (regerror): Likewise.

            (regfree): Likewise.

            * posix/regexec.c (regexec): Likewise.

            (re_match): Likewise.

            (re_search): Likewise.

            (re_match_2): Likewise.

            (re_search_2): Likewise.

            (re_search_stub): Likewise.  Use internal_function

            (re_copy_regs): Likewise.

            (re_set_registers): Convert to prototype-style function

            definition.

            (prune_impossible_nodes): Likewise.  Use internal_function.

            * resolv/inet_net_pton.c (inet_net_pton): Convert to

            prototype-style function definition.

            (inet_net_pton_ipv4): Likewise.

            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.

            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.

            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.

            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.

            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.

            Make variadic.

            * time/strptime_l.c (localtime_r): Convert to prototype-style

            function definition.

            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.

            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.

            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.

            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.

Conflicts:

	malloc/malloc.c

	  (Textual conflict due to malloc reformatting.)

	math/gen-auto-libm-tests.c

	  (Missing backport of ffb536d0ac914a110c160c48d01097d132e20531,

	  Start generating libm tests automatically with MPFR; file

	  deleted manually.)

	sysdeps/pthread/timer_delete.c

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

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

index db4ea9c6f1f42f00..e8db37641ac50573 100644

--- a/crypt/md5-crypt.c

+++ b/crypt/md5-crypt.c

@@ -93,11 +93,7 @@ extern char *__md5_crypt (const char *key, const char *salt);

 /* This entry point is equivalent to the `crypt' function in Unix

    libcs.  */

 char *

-__md5_crypt_r (key, salt, buffer, buflen)

-     const char *key;

-     const char *salt;

-     char *buffer;

-     int buflen;

+__md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen)

 {

   unsigned char alt_result[16]

     __attribute__ ((__aligned__ (__alignof__ (md5_uint32))));

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

index 440933ac015ab2f6..7532d7ddbb558e9a 100644

--- a/crypt/sha256-crypt.c

+++ b/crypt/sha256-crypt.c

@@ -101,11 +101,7 @@ extern char *__sha256_crypt (const char *key, const char *salt);

 char *

-__sha256_crypt_r (key, salt, buffer, buflen)

-     const char *key;

-     const char *salt;

-     char *buffer;

-     int buflen;

+__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen)

 {

   unsigned char alt_result[32]

     __attribute__ ((__aligned__ (__alignof__ (uint32_t))));

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

index e5d9cacfdac437a1..8cba4264d2a871e5 100644

--- a/crypt/sha512-crypt.c

+++ b/crypt/sha512-crypt.c

@@ -101,11 +101,7 @@ extern char *__sha512_crypt (const char *key, const char *salt);

 char *

-__sha512_crypt_r (key, salt, buffer, buflen)

-     const char *key;

-     const char *salt;

-     char *buffer;

-     int buflen;

+__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen)

 {

   unsigned char alt_result[64]

     __attribute__ ((__aligned__ (__alignof__ (uint64_t))));

diff --git a/debug/backtracesyms.c b/debug/backtracesyms.c

index 3fabf26a8be2289c..938f5f6ff6b38b8a 100644

--- a/debug/backtracesyms.c

+++ b/debug/backtracesyms.c

@@ -34,9 +34,7 @@

 char **

-__backtrace_symbols (array, size)

-     void *const *array;

-     int size;

+__backtrace_symbols (void *const *array, int size)

 {

   Dl_info info[size];

   int status[size];

diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c

index a8b2d4f339e4c3dd..55ee1af9829bd8f1 100644

--- a/elf/dl-minimal.c

+++ b/elf/dl-minimal.c

@@ -309,11 +309,8 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group)

    also has to be present and it is never about speed when these

    functions are used.  */

 char *

-_itoa (value, buflim, base, upper_case)

-     unsigned long long int value;

-     char *buflim;

-     unsigned int base;

-     int upper_case;

+_itoa (unsigned long long int value, char *buflim, unsigned int base,

+       int upper_case)

 {

   assert (! upper_case);

diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c

index da611653b602975f..8d1ac3069758bd2d 100644

--- a/hurd/hurdmalloc.c

+++ b/hurd/hurdmalloc.c

@@ -202,8 +202,7 @@ more_memory(int size, free_list_t fl)

 /* Declaration changed to standard one for GNU.  */

 void *

-malloc(size)

-	size_t size;

+malloc (size_t size)

 {

 	int i, n;

 	free_list_t fl;

@@ -269,8 +268,7 @@ malloc(size)

 /* Declaration changed to standard one for GNU.  */

 void

-free(base)

-	void *base;

+free (void *base)

 {

 	header_t h;

 	free_list_t fl;

@@ -318,9 +316,7 @@ free(base)

 /* Declaration changed to standard one for GNU.  */

 void *

-realloc(old_base, new_size)

-        void *old_base;

-        size_t new_size;

+realloc (void *old_base, size_t new_size)

 {

 	header_t h;

 	free_list_t fl;

diff --git a/inet/inet6_option.c b/inet/inet6_option.c

index b5ca2a604126b93a..d8c202b867bbe9f6 100644

--- a/inet/inet6_option.c

+++ b/inet/inet6_option.c

@@ -88,8 +88,7 @@ static uint8_t *option_alloc (struct cmsghdr *cmsg, int datalen, int multx,

    beginning (the value y in the alignment term "xn + y"), the type

    byte, the length byte, and the option data.  */

 int

-inet6_option_space (nbytes)

-     int nbytes;

+inet6_option_space (int nbytes)

 {

   /* Add room for the extension header.  */

   nbytes += sizeof (struct ip6_ext);

@@ -106,10 +105,7 @@ link_warning (inet6_option_space,

    contain either Hop-by-Hop or Destination options.  It returns 0 on

    success or -1 on an error.  */

 int

-inet6_option_init (bp, cmsgp, type)

-     void *bp;

-     struct cmsghdr **cmsgp;

-     int type;

+inet6_option_init (void *bp, struct cmsghdr **cmsgp, int type)

 {

   /* Only Hop-by-Hop or Destination options allowed.  */

   if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)

@@ -143,11 +139,8 @@ link_warning (inet6_option_init,

    inet6_option_init().  This function returns 0 if it succeeds or -1 on

    an error.  */

 int

-inet6_option_append (cmsg, typep, multx, plusy)

-     struct cmsghdr *cmsg;

-     const uint8_t *typep;

-     int multx;

-     int plusy;

+inet6_option_append (struct cmsghdr *cmsg, const uint8_t *typep, int multx,

+		     int plusy)

 {

   /* typep is a pointer to the 8-bit option type.  It is assumed that this

      field is immediately followed by the 8-bit option data length field,

@@ -223,11 +216,7 @@ option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)

 uint8_t *

-inet6_option_alloc (cmsg, datalen, multx, plusy)

-     struct cmsghdr *cmsg;

-     int datalen;

-     int multx;

-     int plusy;

+inet6_option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)

 {

   return option_alloc (cmsg, datalen, multx, plusy);

 }

@@ -245,9 +234,7 @@ link_warning (inet6_option_alloc,

    to be processed, the return value is -1 and *tptrp is NULL.  If an

    error occurs, the return value is -1 and *tptrp is not NULL.  */

 int

-inet6_option_next (cmsg, tptrp)

-     const struct cmsghdr *cmsg;

-     uint8_t **tptrp;

+inet6_option_next (const struct cmsghdr *cmsg, uint8_t **tptrp)

 {

   /* Make sure it is an option of the right type.  */

   if (cmsg->cmsg_level != IPPROTO_IPV6

@@ -303,10 +290,7 @@ link_warning (inet6_option_next,

    pointer to cmsghdr structure of which cmsg_level equals IPPROTO_IPV6

    and cmsg_type equals either IPV6_HOPOPTS or IPV6_DSTOPTS.  */

 int

-inet6_option_find (cmsg, tptrp, type)

-     const struct cmsghdr *cmsg;

-     uint8_t **tptrp;

-     int type;

+inet6_option_find (const struct cmsghdr *cmsg, uint8_t **tptrp, int type)

 {

   /* Make sure it is an option of the right type.  */

   if (cmsg->cmsg_level != IPPROTO_IPV6

diff --git a/io/ftw.c b/io/ftw.c

index ffdb4b02dc7ca4d5..57777b3de86e417c 100644

--- a/io/ftw.c

+++ b/io/ftw.c

@@ -817,21 +817,14 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,

 /* Entry points.  */

 int

-FTW_NAME (path, func, descriptors)

-     const char *path;

-     FTW_FUNC_T func;

-     int descriptors;

+FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors)

 {

   return ftw_startup (path, 0, func, descriptors, 0);

 }

 #ifndef _LIBC

 int

-NFTW_NAME (path, func, descriptors, flags)

-     const char *path;

-     NFTW_FUNC_T func;

-     int descriptors;

-     int flags;

+NFTW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)

 {

   return ftw_startup (path, 1, func, descriptors, flags);

 }

@@ -842,11 +835,7 @@ NFTW_NAME (path, func, descriptors, flags)

 int NFTW_NEW_NAME (const char *, NFTW_FUNC_T, int, int);

 int

-NFTW_NEW_NAME (path, func, descriptors, flags)

-     const char *path;

-     NFTW_FUNC_T func;

-     int descriptors;

-     int flags;

+NFTW_NEW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)

 {

   if (flags

       & ~(FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH | FTW_ACTIONRETVAL))

@@ -867,11 +856,7 @@ int NFTW_OLD_NAME (const char *, NFTW_FUNC_T, int, int);

 int

 attribute_compat_text_section

-NFTW_OLD_NAME (path, func, descriptors, flags)

-     const char *path;

-     NFTW_FUNC_T func;

-     int descriptors;

-     int flags;

+NFTW_OLD_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)

 {

   flags &= (FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH);

   return ftw_startup (path, 1, func, descriptors, flags);

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

index 675fbccc794ffe79..fe685402001a5336 100644

--- a/libio/iofwide.c

+++ b/libio/iofwide.c

@@ -93,9 +93,7 @@ const struct __gconv_trans_data __libio_translit attribute_hidden =

    the orientation first.  */

 #undef _IO_fwide

 int

-_IO_fwide (fp, mode)

-     _IO_FILE *fp;

-     int mode;

+_IO_fwide (_IO_FILE *fp, int mode)

 {

   /* Normalize the value.  */

   mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1);

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

index a5b76af963e77877..fdd113a60811e593 100644

--- a/libio/strops.c

+++ b/libio/strops.c

@@ -31,11 +31,8 @@

 #include <stdio_ext.h>

 void

-_IO_str_init_static_internal (sf, ptr, size, pstart)

-     _IO_strfile *sf;

-     char *ptr;

-     _IO_size_t size;

-     char *pstart;

+_IO_str_init_static_internal (_IO_strfile *sf, char *ptr, _IO_size_t size,

+			      char *pstart)

 {

   _IO_FILE *fp = &sf->_sbf._f;

   char *end;

@@ -81,9 +78,7 @@ _IO_str_init_readonly (_IO_strfile *sf, const char *ptr, int size)

 }

 int

-_IO_str_overflow (fp, c)

-     _IO_FILE *fp;

-     int c;

+_IO_str_overflow (_IO_FILE *fp, int c)

 {

   int flush_only = c == EOF;

   _IO_size_t pos;

@@ -144,8 +139,7 @@ _IO_str_overflow (fp, c)

 libc_hidden_def (_IO_str_overflow)

 int

-_IO_str_underflow (fp)

-     _IO_FILE *fp;

+_IO_str_underflow (_IO_FILE *fp)

 {

   if (fp->_IO_write_ptr > fp->_IO_read_end)

     fp->_IO_read_end = fp->_IO_write_ptr;

@@ -165,8 +159,7 @@ libc_hidden_def (_IO_str_underflow)

 /* The size of the valid part of the buffer.  */

 _IO_ssize_t

-_IO_str_count (fp)

-     _IO_FILE *fp;

+_IO_str_count (_IO_FILE *fp)

 {

   return ((fp->_IO_write_ptr > fp->_IO_read_end

 	   ? fp->_IO_write_ptr : fp->_IO_read_end)

@@ -239,11 +232,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)

 _IO_off64_t

-_IO_str_seekoff (fp, offset, dir, mode)

-     _IO_FILE *fp;

-     _IO_off64_t offset;

-     int dir;

-     int mode;

+_IO_str_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)

 {

   _IO_off64_t new_pos;

@@ -316,9 +305,7 @@ _IO_str_seekoff (fp, offset, dir, mode)

 libc_hidden_def (_IO_str_seekoff)

 int

-_IO_str_pbackfail (fp, c)

-     _IO_FILE *fp;

-     int c;

+_IO_str_pbackfail (_IO_FILE *fp, int c)

 {

   if ((fp->_flags & _IO_NO_WRITES) && c != EOF)

     return EOF;

@@ -327,9 +314,7 @@ _IO_str_pbackfail (fp, c)

 libc_hidden_def (_IO_str_pbackfail)

 void

-_IO_str_finish (fp, dummy)

-     _IO_FILE *fp;

-     int dummy;

+_IO_str_finish (_IO_FILE *fp, int dummy)

 {

   if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))

     (((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);

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

index d84c5883ad7ca20d..7a9a33ab8763b8ff 100644

--- a/libio/wstrops.c

+++ b/libio/wstrops.c

@@ -32,11 +32,8 @@

 #include <stdio_ext.h>

 void

-_IO_wstr_init_static (fp, ptr, size, pstart)

-     _IO_FILE *fp;

-     wchar_t *ptr;

-     _IO_size_t size;

-     wchar_t *pstart;

+_IO_wstr_init_static (_IO_FILE *fp, wchar_t *ptr, _IO_size_t size,

+		      wchar_t *pstart)

 {

   wchar_t *end;

@@ -70,9 +67,7 @@ _IO_wstr_init_static (fp, ptr, size, pstart)

 }

 _IO_wint_t

-_IO_wstr_overflow (fp, c)

-     _IO_FILE *fp;

-     _IO_wint_t c;

+_IO_wstr_overflow (_IO_FILE *fp, _IO_wint_t c)

 {

   int flush_only = c == WEOF;

   _IO_size_t pos;

@@ -142,8 +137,7 @@ _IO_wstr_overflow (fp, c)

 _IO_wint_t

-_IO_wstr_underflow (fp)

-     _IO_FILE *fp;

+_IO_wstr_underflow (_IO_FILE *fp)

 {

   if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end)

     fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr;

@@ -162,8 +156,7 @@ _IO_wstr_underflow (fp)

 /* The size of the valid part of the buffer.  */

 _IO_ssize_t

-_IO_wstr_count (fp)

-     _IO_FILE *fp;

+_IO_wstr_count (_IO_FILE *fp)

 {

   struct _IO_wide_data *wd = fp->_wide_data;

@@ -244,11 +237,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)

 _IO_off64_t

-_IO_wstr_seekoff (fp, offset, dir, mode)

-     _IO_FILE *fp;

-     _IO_off64_t offset;

-     int dir;

-     int mode;

+_IO_wstr_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)

 {

   _IO_off64_t new_pos;

@@ -326,9 +315,7 @@ _IO_wstr_seekoff (fp, offset, dir, mode)

 }

 _IO_wint_t

-_IO_wstr_pbackfail (fp, c)

-     _IO_FILE *fp;

-     _IO_wint_t c;

+_IO_wstr_pbackfail (_IO_FILE *fp, _IO_wint_t c)

 {

   if ((fp->_flags & _IO_NO_WRITES) && c != WEOF)

     return WEOF;

@@ -336,9 +323,7 @@ _IO_wstr_pbackfail (fp, c)

 }

 void

-_IO_wstr_finish (fp, dummy)

-     _IO_FILE *fp;

-     int dummy;

+_IO_wstr_finish (_IO_FILE *fp, int dummy)

 {

   if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF))

     (((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base);

diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c

index d1a8916888d21235..4a63f68dd8309ec7 100644

--- a/locale/programs/localedef.c

+++ b/locale/programs/localedef.c

@@ -491,9 +491,7 @@ construct_output_path (char *path)

    names.  Normalization allows the user to use any of the common

    names.  */

 static const char *

-normalize_codeset (codeset, name_len)

-     const char *codeset;

-     size_t name_len;

+normalize_codeset (const char *codeset, size_t name_len)

 {

   int len = 0;

   int only_digit = 1;

diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c

index 1eae271186bc80a9..de98b994425474ba 100644

--- a/locale/programs/locarchive.c

+++ b/locale/programs/locarchive.c

@@ -1059,11 +1059,8 @@ add_locale (struct locarhandle *ah,

    of the files if necessary.  Add all the names, possibly overwriting

    old files.  */

 int

-add_locale_to_archive (ah, name, data, replace)

-     struct locarhandle *ah;

-     const char *name;

-     locale_data_t data;

-     bool replace;

+add_locale_to_archive (struct locarhandle *ah, const char *name,

+		       locale_data_t data, bool replace)

 {

   char *normalized_name = NULL;

   uint32_t locrec_offset;

@@ -1260,10 +1257,7 @@ add_locale_to_archive (ah, name, data, replace)

 int

-add_locales_to_archive (nlist, list, replace)

-     size_t nlist;

-     char *list[];

-     bool replace;

+add_locales_to_archive (size_t nlist, char *list[], bool replace)

 {

   struct locarhandle ah;

   int result = 0;

@@ -1460,9 +1454,7 @@ add_locales_to_archive (nlist, list, replace)

 int

-delete_locales_from_archive (nlist, list)

-     size_t nlist;

-     char *list[];

+delete_locales_from_archive (size_t nlist, char *list[])

 {

   struct locarhandle ah;

   struct locarhead *head;

diff --git a/malloc/malloc.c b/malloc/malloc.c

index 3e7b9bf9e8d71247..1de07de97bb421d6 100644

--- a/malloc/malloc.c

+++ b/malloc/malloc.c

@@ -4662,7 +4662,8 @@ int_mallinfo(mstate av, struct mallinfo *m)

 }

-struct mallinfo __libc_mallinfo()

+struct mallinfo

+__libc_mallinfo (void)

 {

   struct mallinfo m;

   mstate ar_ptr;

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

index eb4d97d7eee89a89..5f012e9ba9f678dc 100644

--- a/misc/tsearch.c

+++ b/misc/tsearch.c

@@ -300,10 +300,7 @@ weak_alias (__tsearch, tsearch)

    KEY is the key to be located, ROOTP is the address of tree root,

    COMPAR the ordering function.  */

 void *

-__tfind (key, vrootp, compar)

-     const void *key;

-     void *const *vrootp;

-     __compar_fn_t compar;

+__tfind (const void *key, void *const *vrootp, __compar_fn_t compar)

 {

   node *rootp = (node *) vrootp;

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

index c79752d89d05e158..ccdb5cc41f10bcdf 100644

--- a/nptl/pthread_attr_destroy.c

+++ b/nptl/pthread_attr_destroy.c

@@ -24,8 +24,7 @@

 #include <shlib-compat.h>

 int

-__pthread_attr_destroy (attr)

-     pthread_attr_t *attr;

+__pthread_attr_destroy (pthread_attr_t *attr)

 {