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

c6d234
commit 9dd346ff431fc761f1b748bd4da8bb59f7652094
c6d234
Author: Joseph Myers <joseph@codesourcery.com>
c6d234
Date:   Tue Oct 20 11:54:09 2015 +0000
c6d234
c6d234
    Convert 113 more function definitions to prototype style (files with assertions).
c6d234
    
c6d234
    This mostly automatically-generated patch converts 113 function
c6d234
    definitions in glibc from old-style K&R to prototype-style.  Following
c6d234
    my other recent such patches, this one deals with the case of function
c6d234
    definitions in files that either contain assertions or where grep
c6d234
    suggested they might contain assertions - and thus where it isn't
c6d234
    possible to use a simple object code comparison as a sanity check on
c6d234
    the correctness of the patch, because line numbers are changed.
c6d234
    
c6d234
    A few such automatically-generated changes needed to be supplemented
c6d234
    by manual changes for the result to compile.  openat64 had a prototype
c6d234
    declaration with "..." but an old-style definition in
c6d234
    sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
c6d234
    generated prototype in the definition (I've filed
c6d234
    <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
c6d234
    such cases in GCC; the old state was undefined behavior not requiring
c6d234
    a diagnostic, but one seems a good idea).  In addition, as Florian has
c6d234
    noted regparm attribute mismatches between declaration and definition
c6d234
    are only diagnosed for prototype definitions, and five functions
c6d234
    needed internal_function added to their definitions (in the case of
c6d234
    __pthread_mutex_cond_lock, via the macro definition of
c6d234
    __pthread_mutex_lock) to compile on i386.
c6d234
    
c6d234
    After this patch is in, remaining old-style definitions are probably
c6d234
    most readily fixed manually before we can turn on
c6d234
    -Wold-style-definition for all builds.
c6d234
    
c6d234
    Tested for x86_64 and x86 (testsuite).
c6d234
    
c6d234
            * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
c6d234
            function definition.
c6d234
            * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
c6d234
            * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
c6d234
            * debug/backtracesyms.c (__backtrace_symbols): Likewise.
c6d234
            * elf/dl-minimal.c (_itoa): Likewise.
c6d234
            * hurd/hurdmalloc.c (malloc): Likewise.
c6d234
            (free): Likewise.
c6d234
            (realloc): Likewise.
c6d234
            * inet/inet6_option.c (inet6_option_space): Likewise.
c6d234
            (inet6_option_init): Likewise.
c6d234
            (inet6_option_append): Likewise.
c6d234
            (inet6_option_alloc): Likewise.
c6d234
            (inet6_option_next): Likewise.
c6d234
            (inet6_option_find): Likewise.
c6d234
            * io/ftw.c (FTW_NAME): Likewise.
c6d234
            (NFTW_NAME): Likewise.
c6d234
            (NFTW_NEW_NAME): Likewise.
c6d234
            (NFTW_OLD_NAME): Likewise.
c6d234
            * libio/iofwide.c (_IO_fwide): Likewise.
c6d234
            * libio/strops.c (_IO_str_init_static_internal): Likewise.
c6d234
            (_IO_str_init_static): Likewise.
c6d234
            (_IO_str_init_readonly): Likewise.
c6d234
            (_IO_str_overflow): Likewise.
c6d234
            (_IO_str_underflow): Likewise.
c6d234
            (_IO_str_count): Likewise.
c6d234
            (_IO_str_seekoff): Likewise.
c6d234
            (_IO_str_pbackfail): Likewise.
c6d234
            (_IO_str_finish): Likewise.
c6d234
            * libio/wstrops.c (_IO_wstr_init_static): Likewise.
c6d234
            (_IO_wstr_overflow): Likewise.
c6d234
            (_IO_wstr_underflow): Likewise.
c6d234
            (_IO_wstr_count): Likewise.
c6d234
            (_IO_wstr_seekoff): Likewise.
c6d234
            (_IO_wstr_pbackfail): Likewise.
c6d234
            (_IO_wstr_finish): Likewise.
c6d234
            * locale/programs/localedef.c (normalize_codeset): Likewise.
c6d234
            * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
c6d234
            (add_locales_to_archive): Likewise.
c6d234
            (delete_locales_from_archive): Likewise.
c6d234
            * malloc/malloc.c (__libc_mallinfo): Likewise.
c6d234
            * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
c6d234
            * misc/tsearch.c (__tfind): Likewise.
c6d234
            * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
c6d234
            * nptl/pthread_attr_getdetachstate.c
c6d234
            (__pthread_attr_getdetachstate): Likewise.
c6d234
            * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_getinheritsched.c
c6d234
            (__pthread_attr_getinheritsched): Likewise.
c6d234
            * nptl/pthread_attr_getschedparam.c
c6d234
            (__pthread_attr_getschedparam): Likewise.
c6d234
            * nptl/pthread_attr_getschedpolicy.c
c6d234
            (__pthread_attr_getschedpolicy): Likewise.
c6d234
            * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
c6d234
            (__pthread_attr_init_2_0): Likewise.
c6d234
            * nptl/pthread_attr_setdetachstate.c
c6d234
            (__pthread_attr_setdetachstate): Likewise.
c6d234
            * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_setinheritsched.c
c6d234
            (__pthread_attr_setinheritsched): Likewise.
c6d234
            * nptl/pthread_attr_setschedparam.c
c6d234
            (__pthread_attr_setschedparam): Likewise.
c6d234
            * nptl/pthread_attr_setschedpolicy.c
c6d234
            (__pthread_attr_setschedpolicy): Likewise.
c6d234
            * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
c6d234
            Likewise.
c6d234
            * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
c6d234
            Likewise.
c6d234
            * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
c6d234
            Likewise.
c6d234
            * nptl/pthread_create.c (__find_in_stack_list): Likewise.
c6d234
            * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
c6d234
            * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
c6d234
            use internal_function.
c6d234
            * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
c6d234
            prototype-style function definition.
c6d234
            * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
c6d234
            (__pthread_mutex_cond_lock_adjust): Likewise.  Use
c6d234
            internal_function.
c6d234
            * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
c6d234
            Convert to prototype-style function definition.
c6d234
            * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
c6d234
            Likewise.
c6d234
            * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
c6d234
            Likewise.
c6d234
            (__pthread_mutex_unlock): Likewise.
c6d234
            * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
c6d234
            * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
c6d234
            * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
c6d234
            * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
c6d234
            * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
c6d234
            * nss/makedb.c (process_input): Likewise.
c6d234
            * posix/fnmatch.c (__strchrnul): Likewise.
c6d234
            (__wcschrnul): Likewise.
c6d234
            (fnmatch): Likewise.
c6d234
            * posix/fnmatch_loop.c (FCT): Likewise.
c6d234
            * posix/glob.c (globfree): Likewise.
c6d234
            (__glob_pattern_type): Likewise.
c6d234
            (__glob_pattern_p): Likewise.
c6d234
            * posix/regcomp.c (re_compile_pattern): Likewise.
c6d234
            (re_set_syntax): Likewise.
c6d234
            (re_compile_fastmap): Likewise.
c6d234
            (regcomp): Likewise.
c6d234
            (regerror): Likewise.
c6d234
            (regfree): Likewise.
c6d234
            * posix/regexec.c (regexec): Likewise.
c6d234
            (re_match): Likewise.
c6d234
            (re_search): Likewise.
c6d234
            (re_match_2): Likewise.
c6d234
            (re_search_2): Likewise.
c6d234
            (re_search_stub): Likewise.  Use internal_function
c6d234
            (re_copy_regs): Likewise.
c6d234
            (re_set_registers): Convert to prototype-style function
c6d234
            definition.
c6d234
            (prune_impossible_nodes): Likewise.  Use internal_function.
c6d234
            * resolv/inet_net_pton.c (inet_net_pton): Convert to
c6d234
            prototype-style function definition.
c6d234
            (inet_net_pton_ipv4): Likewise.
c6d234
            * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
c6d234
            * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
c6d234
            * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
c6d234
            * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
c6d234
            * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
c6d234
            Make variadic.
c6d234
            * time/strptime_l.c (localtime_r): Convert to prototype-style
c6d234
            function definition.
c6d234
            * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
c6d234
            * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
c6d234
            * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
c6d234
            * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
c6d234
c6d234
Conflicts:
c6d234
	malloc/malloc.c
c6d234
	  (Textual conflict due to malloc reformatting.)
c6d234
	math/gen-auto-libm-tests.c
c6d234
	  (Missing backport of ffb536d0ac914a110c160c48d01097d132e20531,
c6d234
	  Start generating libm tests automatically with MPFR; file
c6d234
	  deleted manually.)
c6d234
	sysdeps/pthread/timer_delete.c
c6d234
	  (Applied to nptl/sysdeps/pthread/timer_delete.c.)
c6d234
c6d234
diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
c6d234
index db4ea9c6f1f42f00..e8db37641ac50573 100644
c6d234
--- a/crypt/md5-crypt.c
c6d234
+++ b/crypt/md5-crypt.c
c6d234
@@ -93,11 +93,7 @@ extern char *__md5_crypt (const char *key, const char *salt);
c6d234
 /* This entry point is equivalent to the `crypt' function in Unix
c6d234
    libcs.  */
c6d234
 char *
c6d234
-__md5_crypt_r (key, salt, buffer, buflen)
c6d234
-     const char *key;
c6d234
-     const char *salt;
c6d234
-     char *buffer;
c6d234
-     int buflen;
c6d234
+__md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
c6d234
 {
c6d234
   unsigned char alt_result[16]
c6d234
     __attribute__ ((__aligned__ (__alignof__ (md5_uint32))));
c6d234
diff --git a/crypt/sha256-crypt.c b/crypt/sha256-crypt.c
c6d234
index 440933ac015ab2f6..7532d7ddbb558e9a 100644
c6d234
--- a/crypt/sha256-crypt.c
c6d234
+++ b/crypt/sha256-crypt.c
c6d234
@@ -101,11 +101,7 @@ extern char *__sha256_crypt (const char *key, const char *salt);
c6d234
 
c6d234
 
c6d234
 char *
c6d234
-__sha256_crypt_r (key, salt, buffer, buflen)
c6d234
-     const char *key;
c6d234
-     const char *salt;
c6d234
-     char *buffer;
c6d234
-     int buflen;
c6d234
+__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
c6d234
 {
c6d234
   unsigned char alt_result[32]
c6d234
     __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
c6d234
diff --git a/crypt/sha512-crypt.c b/crypt/sha512-crypt.c
c6d234
index e5d9cacfdac437a1..8cba4264d2a871e5 100644
c6d234
--- a/crypt/sha512-crypt.c
c6d234
+++ b/crypt/sha512-crypt.c
c6d234
@@ -101,11 +101,7 @@ extern char *__sha512_crypt (const char *key, const char *salt);
c6d234
 
c6d234
 
c6d234
 char *
c6d234
-__sha512_crypt_r (key, salt, buffer, buflen)
c6d234
-     const char *key;
c6d234
-     const char *salt;
c6d234
-     char *buffer;
c6d234
-     int buflen;
c6d234
+__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
c6d234
 {
c6d234
   unsigned char alt_result[64]
c6d234
     __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
c6d234
diff --git a/debug/backtracesyms.c b/debug/backtracesyms.c
c6d234
index 3fabf26a8be2289c..938f5f6ff6b38b8a 100644
c6d234
--- a/debug/backtracesyms.c
c6d234
+++ b/debug/backtracesyms.c
c6d234
@@ -34,9 +34,7 @@
c6d234
 
c6d234
 
c6d234
 char **
c6d234
-__backtrace_symbols (array, size)
c6d234
-     void *const *array;
c6d234
-     int size;
c6d234
+__backtrace_symbols (void *const *array, int size)
c6d234
 {
c6d234
   Dl_info info[size];
c6d234
   int status[size];
c6d234
diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
c6d234
index a8b2d4f339e4c3dd..55ee1af9829bd8f1 100644
c6d234
--- a/elf/dl-minimal.c
c6d234
+++ b/elf/dl-minimal.c
c6d234
@@ -309,11 +309,8 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group)
c6d234
    also has to be present and it is never about speed when these
c6d234
    functions are used.  */
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
   assert (! upper_case);
c6d234
 
c6d234
diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c
c6d234
index da611653b602975f..8d1ac3069758bd2d 100644
c6d234
--- a/hurd/hurdmalloc.c
c6d234
+++ b/hurd/hurdmalloc.c
c6d234
@@ -202,8 +202,7 @@ more_memory(int size, free_list_t fl)
c6d234
 
c6d234
 /* Declaration changed to standard one for GNU.  */
c6d234
 void *
c6d234
-malloc(size)
c6d234
-	size_t size;
c6d234
+malloc (size_t size)
c6d234
 {
c6d234
 	int i, n;
c6d234
 	free_list_t fl;
c6d234
@@ -269,8 +268,7 @@ malloc(size)
c6d234
 
c6d234
 /* Declaration changed to standard one for GNU.  */
c6d234
 void
c6d234
-free(base)
c6d234
-	void *base;
c6d234
+free (void *base)
c6d234
 {
c6d234
 	header_t h;
c6d234
 	free_list_t fl;
c6d234
@@ -318,9 +316,7 @@ free(base)
c6d234
 
c6d234
 /* Declaration changed to standard one for GNU.  */
c6d234
 void *
c6d234
-realloc(old_base, new_size)
c6d234
-        void *old_base;
c6d234
-        size_t new_size;
c6d234
+realloc (void *old_base, size_t new_size)
c6d234
 {
c6d234
 	header_t h;
c6d234
 	free_list_t fl;
c6d234
diff --git a/inet/inet6_option.c b/inet/inet6_option.c
c6d234
index b5ca2a604126b93a..d8c202b867bbe9f6 100644
c6d234
--- a/inet/inet6_option.c
c6d234
+++ b/inet/inet6_option.c
c6d234
@@ -88,8 +88,7 @@ static uint8_t *option_alloc (struct cmsghdr *cmsg, int datalen, int multx,
c6d234
    beginning (the value y in the alignment term "xn + y"), the type
c6d234
    byte, the length byte, and the option data.  */
c6d234
 int
c6d234
-inet6_option_space (nbytes)
c6d234
-     int nbytes;
c6d234
+inet6_option_space (int nbytes)
c6d234
 {
c6d234
   /* Add room for the extension header.  */
c6d234
   nbytes += sizeof (struct ip6_ext);
c6d234
@@ -106,10 +105,7 @@ link_warning (inet6_option_space,
c6d234
    contain either Hop-by-Hop or Destination options.  It returns 0 on
c6d234
    success or -1 on an error.  */
c6d234
 int
c6d234
-inet6_option_init (bp, cmsgp, type)
c6d234
-     void *bp;
c6d234
-     struct cmsghdr **cmsgp;
c6d234
-     int type;
c6d234
+inet6_option_init (void *bp, struct cmsghdr **cmsgp, int type)
c6d234
 {
c6d234
   /* Only Hop-by-Hop or Destination options allowed.  */
c6d234
   if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
c6d234
@@ -143,11 +139,8 @@ link_warning (inet6_option_init,
c6d234
    inet6_option_init().  This function returns 0 if it succeeds or -1 on
c6d234
    an error.  */
c6d234
 int
c6d234
-inet6_option_append (cmsg, typep, multx, plusy)
c6d234
-     struct cmsghdr *cmsg;
c6d234
-     const uint8_t *typep;
c6d234
-     int multx;
c6d234
-     int plusy;
c6d234
+inet6_option_append (struct cmsghdr *cmsg, const uint8_t *typep, int multx,
c6d234
+		     int plusy)
c6d234
 {
c6d234
   /* typep is a pointer to the 8-bit option type.  It is assumed that this
c6d234
      field is immediately followed by the 8-bit option data length field,
c6d234
@@ -223,11 +216,7 @@ option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)
c6d234
 
c6d234
 
c6d234
 uint8_t *
c6d234
-inet6_option_alloc (cmsg, datalen, multx, plusy)
c6d234
-     struct cmsghdr *cmsg;
c6d234
-     int datalen;
c6d234
-     int multx;
c6d234
-     int plusy;
c6d234
+inet6_option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)
c6d234
 {
c6d234
   return option_alloc (cmsg, datalen, multx, plusy);
c6d234
 }
c6d234
@@ -245,9 +234,7 @@ link_warning (inet6_option_alloc,
c6d234
    to be processed, the return value is -1 and *tptrp is NULL.  If an
c6d234
    error occurs, the return value is -1 and *tptrp is not NULL.  */
c6d234
 int
c6d234
-inet6_option_next (cmsg, tptrp)
c6d234
-     const struct cmsghdr *cmsg;
c6d234
-     uint8_t **tptrp;
c6d234
+inet6_option_next (const struct cmsghdr *cmsg, uint8_t **tptrp)
c6d234
 {
c6d234
   /* Make sure it is an option of the right type.  */
c6d234
   if (cmsg->cmsg_level != IPPROTO_IPV6
c6d234
@@ -303,10 +290,7 @@ link_warning (inet6_option_next,
c6d234
    pointer to cmsghdr structure of which cmsg_level equals IPPROTO_IPV6
c6d234
    and cmsg_type equals either IPV6_HOPOPTS or IPV6_DSTOPTS.  */
c6d234
 int
c6d234
-inet6_option_find (cmsg, tptrp, type)
c6d234
-     const struct cmsghdr *cmsg;
c6d234
-     uint8_t **tptrp;
c6d234
-     int type;
c6d234
+inet6_option_find (const struct cmsghdr *cmsg, uint8_t **tptrp, int type)
c6d234
 {
c6d234
   /* Make sure it is an option of the right type.  */
c6d234
   if (cmsg->cmsg_level != IPPROTO_IPV6
c6d234
diff --git a/io/ftw.c b/io/ftw.c
c6d234
index ffdb4b02dc7ca4d5..57777b3de86e417c 100644
c6d234
--- a/io/ftw.c
c6d234
+++ b/io/ftw.c
c6d234
@@ -817,21 +817,14 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
c6d234
 /* Entry points.  */
c6d234
 
c6d234
 int
c6d234
-FTW_NAME (path, func, descriptors)
c6d234
-     const char *path;
c6d234
-     FTW_FUNC_T func;
c6d234
-     int descriptors;
c6d234
+FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors)
c6d234
 {
c6d234
   return ftw_startup (path, 0, func, descriptors, 0);
c6d234
 }
c6d234
 
c6d234
 #ifndef _LIBC
c6d234
 int
c6d234
-NFTW_NAME (path, func, descriptors, flags)
c6d234
-     const char *path;
c6d234
-     NFTW_FUNC_T func;
c6d234
-     int descriptors;
c6d234
-     int flags;
c6d234
+NFTW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
c6d234
 {
c6d234
   return ftw_startup (path, 1, func, descriptors, flags);
c6d234
 }
c6d234
@@ -842,11 +835,7 @@ NFTW_NAME (path, func, descriptors, flags)
c6d234
 int NFTW_NEW_NAME (const char *, NFTW_FUNC_T, int, int);
c6d234
 
c6d234
 int
c6d234
-NFTW_NEW_NAME (path, func, descriptors, flags)
c6d234
-     const char *path;
c6d234
-     NFTW_FUNC_T func;
c6d234
-     int descriptors;
c6d234
-     int flags;
c6d234
+NFTW_NEW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
c6d234
 {
c6d234
   if (flags
c6d234
       & ~(FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH | FTW_ACTIONRETVAL))
c6d234
@@ -867,11 +856,7 @@ int NFTW_OLD_NAME (const char *, NFTW_FUNC_T, int, int);
c6d234
 
c6d234
 int
c6d234
 attribute_compat_text_section
c6d234
-NFTW_OLD_NAME (path, func, descriptors, flags)
c6d234
-     const char *path;
c6d234
-     NFTW_FUNC_T func;
c6d234
-     int descriptors;
c6d234
-     int flags;
c6d234
+NFTW_OLD_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
c6d234
 {
c6d234
   flags &= (FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH);
c6d234
   return ftw_startup (path, 1, func, descriptors, flags);
c6d234
diff --git a/libio/iofwide.c b/libio/iofwide.c
c6d234
index 675fbccc794ffe79..fe685402001a5336 100644
c6d234
--- a/libio/iofwide.c
c6d234
+++ b/libio/iofwide.c
c6d234
@@ -93,9 +93,7 @@ const struct __gconv_trans_data __libio_translit attribute_hidden =
c6d234
    the orientation first.  */
c6d234
 #undef _IO_fwide
c6d234
 int
c6d234
-_IO_fwide (fp, mode)
c6d234
-     _IO_FILE *fp;
c6d234
-     int mode;
c6d234
+_IO_fwide (_IO_FILE *fp, int mode)
c6d234
 {
c6d234
   /* Normalize the value.  */
c6d234
   mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1);
c6d234
diff --git a/libio/strops.c b/libio/strops.c
c6d234
index a5b76af963e77877..fdd113a60811e593 100644
c6d234
--- a/libio/strops.c
c6d234
+++ b/libio/strops.c
c6d234
@@ -31,11 +31,8 @@
c6d234
 #include <stdio_ext.h>
c6d234
 
c6d234
 void
c6d234
-_IO_str_init_static_internal (sf, ptr, size, pstart)
c6d234
-     _IO_strfile *sf;
c6d234
-     char *ptr;
c6d234
-     _IO_size_t size;
c6d234
-     char *pstart;
c6d234
+_IO_str_init_static_internal (_IO_strfile *sf, char *ptr, _IO_size_t size,
c6d234
+			      char *pstart)
c6d234
 {
c6d234
   _IO_FILE *fp = &sf->_sbf._f;
c6d234
   char *end;
c6d234
@@ -81,9 +78,7 @@ _IO_str_init_readonly (_IO_strfile *sf, const char *ptr, int size)
c6d234
 }
c6d234
 
c6d234
 int
c6d234
-_IO_str_overflow (fp, c)
c6d234
-     _IO_FILE *fp;
c6d234
-     int c;
c6d234
+_IO_str_overflow (_IO_FILE *fp, int c)
c6d234
 {
c6d234
   int flush_only = c == EOF;
c6d234
   _IO_size_t pos;
c6d234
@@ -144,8 +139,7 @@ _IO_str_overflow (fp, c)
c6d234
 libc_hidden_def (_IO_str_overflow)
c6d234
 
c6d234
 int
c6d234
-_IO_str_underflow (fp)
c6d234
-     _IO_FILE *fp;
c6d234
+_IO_str_underflow (_IO_FILE *fp)
c6d234
 {
c6d234
   if (fp->_IO_write_ptr > fp->_IO_read_end)
c6d234
     fp->_IO_read_end = fp->_IO_write_ptr;
c6d234
@@ -165,8 +159,7 @@ libc_hidden_def (_IO_str_underflow)
c6d234
 /* The size of the valid part of the buffer.  */
c6d234
 
c6d234
 _IO_ssize_t
c6d234
-_IO_str_count (fp)
c6d234
-     _IO_FILE *fp;
c6d234
+_IO_str_count (_IO_FILE *fp)
c6d234
 {
c6d234
   return ((fp->_IO_write_ptr > fp->_IO_read_end
c6d234
 	   ? fp->_IO_write_ptr : fp->_IO_read_end)
c6d234
@@ -239,11 +232,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
c6d234
 
c6d234
 
c6d234
 _IO_off64_t
c6d234
-_IO_str_seekoff (fp, offset, dir, mode)
c6d234
-     _IO_FILE *fp;
c6d234
-     _IO_off64_t offset;
c6d234
-     int dir;
c6d234
-     int mode;
c6d234
+_IO_str_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)
c6d234
 {
c6d234
   _IO_off64_t new_pos;
c6d234
 
c6d234
@@ -316,9 +305,7 @@ _IO_str_seekoff (fp, offset, dir, mode)
c6d234
 libc_hidden_def (_IO_str_seekoff)
c6d234
 
c6d234
 int
c6d234
-_IO_str_pbackfail (fp, c)
c6d234
-     _IO_FILE *fp;
c6d234
-     int c;
c6d234
+_IO_str_pbackfail (_IO_FILE *fp, int c)
c6d234
 {
c6d234
   if ((fp->_flags & _IO_NO_WRITES) && c != EOF)
c6d234
     return EOF;
c6d234
@@ -327,9 +314,7 @@ _IO_str_pbackfail (fp, c)
c6d234
 libc_hidden_def (_IO_str_pbackfail)
c6d234
 
c6d234
 void
c6d234
-_IO_str_finish (fp, dummy)
c6d234
-     _IO_FILE *fp;
c6d234
-     int dummy;
c6d234
+_IO_str_finish (_IO_FILE *fp, int dummy)
c6d234
 {
c6d234
   if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
c6d234
     (((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);
c6d234
diff --git a/libio/wstrops.c b/libio/wstrops.c
c6d234
index d84c5883ad7ca20d..7a9a33ab8763b8ff 100644
c6d234
--- a/libio/wstrops.c
c6d234
+++ b/libio/wstrops.c
c6d234
@@ -32,11 +32,8 @@
c6d234
 #include <stdio_ext.h>
c6d234
 
c6d234
 void
c6d234
-_IO_wstr_init_static (fp, ptr, size, pstart)
c6d234
-     _IO_FILE *fp;
c6d234
-     wchar_t *ptr;
c6d234
-     _IO_size_t size;
c6d234
-     wchar_t *pstart;
c6d234
+_IO_wstr_init_static (_IO_FILE *fp, wchar_t *ptr, _IO_size_t size,
c6d234
+		      wchar_t *pstart)
c6d234
 {
c6d234
   wchar_t *end;
c6d234
 
c6d234
@@ -70,9 +67,7 @@ _IO_wstr_init_static (fp, ptr, size, pstart)
c6d234
 }
c6d234
 
c6d234
 _IO_wint_t
c6d234
-_IO_wstr_overflow (fp, c)
c6d234
-     _IO_FILE *fp;
c6d234
-     _IO_wint_t c;
c6d234
+_IO_wstr_overflow (_IO_FILE *fp, _IO_wint_t c)
c6d234
 {
c6d234
   int flush_only = c == WEOF;
c6d234
   _IO_size_t pos;
c6d234
@@ -142,8 +137,7 @@ _IO_wstr_overflow (fp, c)
c6d234
 
c6d234
 
c6d234
 _IO_wint_t
c6d234
-_IO_wstr_underflow (fp)
c6d234
-     _IO_FILE *fp;
c6d234
+_IO_wstr_underflow (_IO_FILE *fp)
c6d234
 {
c6d234
   if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end)
c6d234
     fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr;
c6d234
@@ -162,8 +156,7 @@ _IO_wstr_underflow (fp)
c6d234
 
c6d234
 /* The size of the valid part of the buffer.  */
c6d234
 _IO_ssize_t
c6d234
-_IO_wstr_count (fp)
c6d234
-     _IO_FILE *fp;
c6d234
+_IO_wstr_count (_IO_FILE *fp)
c6d234
 {
c6d234
   struct _IO_wide_data *wd = fp->_wide_data;
c6d234
 
c6d234
@@ -244,11 +237,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
c6d234
 
c6d234
 
c6d234
 _IO_off64_t
c6d234
-_IO_wstr_seekoff (fp, offset, dir, mode)
c6d234
-     _IO_FILE *fp;
c6d234
-     _IO_off64_t offset;
c6d234
-     int dir;
c6d234
-     int mode;
c6d234
+_IO_wstr_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)
c6d234
 {
c6d234
   _IO_off64_t new_pos;
c6d234
 
c6d234
@@ -326,9 +315,7 @@ _IO_wstr_seekoff (fp, offset, dir, mode)
c6d234
 }
c6d234
 
c6d234
 _IO_wint_t
c6d234
-_IO_wstr_pbackfail (fp, c)
c6d234
-     _IO_FILE *fp;
c6d234
-     _IO_wint_t c;
c6d234
+_IO_wstr_pbackfail (_IO_FILE *fp, _IO_wint_t c)
c6d234
 {
c6d234
   if ((fp->_flags & _IO_NO_WRITES) && c != WEOF)
c6d234
     return WEOF;
c6d234
@@ -336,9 +323,7 @@ _IO_wstr_pbackfail (fp, c)
c6d234
 }
c6d234
 
c6d234
 void
c6d234
-_IO_wstr_finish (fp, dummy)
c6d234
-     _IO_FILE *fp;
c6d234
-     int dummy;
c6d234
+_IO_wstr_finish (_IO_FILE *fp, int dummy)
c6d234
 {
c6d234
   if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF))
c6d234
     (((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base);
c6d234
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
c6d234
index d1a8916888d21235..4a63f68dd8309ec7 100644
c6d234
--- a/locale/programs/localedef.c
c6d234
+++ b/locale/programs/localedef.c
c6d234
@@ -491,9 +491,7 @@ construct_output_path (char *path)
c6d234
    names.  Normalization allows the user to use any of the common
c6d234
    names.  */
c6d234
 static const char *
c6d234
-normalize_codeset (codeset, name_len)
c6d234
-     const char *codeset;
c6d234
-     size_t name_len;
c6d234
+normalize_codeset (const char *codeset, size_t name_len)
c6d234
 {
c6d234
   int len = 0;
c6d234
   int only_digit = 1;
c6d234
diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
c6d234
index 1eae271186bc80a9..de98b994425474ba 100644
c6d234
--- a/locale/programs/locarchive.c
c6d234
+++ b/locale/programs/locarchive.c
c6d234
@@ -1059,11 +1059,8 @@ add_locale (struct locarhandle *ah,
c6d234
    of the files if necessary.  Add all the names, possibly overwriting
c6d234
    old files.  */
c6d234
 int
c6d234
-add_locale_to_archive (ah, name, data, replace)
c6d234
-     struct locarhandle *ah;
c6d234
-     const char *name;
c6d234
-     locale_data_t data;
c6d234
-     bool replace;
c6d234
+add_locale_to_archive (struct locarhandle *ah, const char *name,
c6d234
+		       locale_data_t data, bool replace)
c6d234
 {
c6d234
   char *normalized_name = NULL;
c6d234
   uint32_t locrec_offset;
c6d234
@@ -1260,10 +1257,7 @@ add_locale_to_archive (ah, name, data, replace)
c6d234
 
c6d234
 
c6d234
 int
c6d234
-add_locales_to_archive (nlist, list, replace)
c6d234
-     size_t nlist;
c6d234
-     char *list[];
c6d234
-     bool replace;
c6d234
+add_locales_to_archive (size_t nlist, char *list[], bool replace)
c6d234
 {
c6d234
   struct locarhandle ah;
c6d234
   int result = 0;
c6d234
@@ -1460,9 +1454,7 @@ add_locales_to_archive (nlist, list, replace)
c6d234
 
c6d234
 
c6d234
 int
c6d234
-delete_locales_from_archive (nlist, list)
c6d234
-     size_t nlist;
c6d234
-     char *list[];
c6d234
+delete_locales_from_archive (size_t nlist, char *list[])
c6d234
 {
c6d234
   struct locarhandle ah;
c6d234
   struct locarhead *head;
c6d234
diff --git a/malloc/malloc.c b/malloc/malloc.c
c6d234
index 3e7b9bf9e8d71247..1de07de97bb421d6 100644
c6d234
--- a/malloc/malloc.c
c6d234
+++ b/malloc/malloc.c
c6d234
@@ -4662,7 +4662,8 @@ int_mallinfo(mstate av, struct mallinfo *m)
c6d234
 }
c6d234
 
c6d234
 
c6d234
-struct mallinfo __libc_mallinfo()
c6d234
+struct mallinfo
c6d234
+__libc_mallinfo (void)
c6d234
 {
c6d234
   struct mallinfo m;
c6d234
   mstate ar_ptr;
c6d234
diff --git a/misc/tsearch.c b/misc/tsearch.c
c6d234
index eb4d97d7eee89a89..5f012e9ba9f678dc 100644
c6d234
--- a/misc/tsearch.c
c6d234
+++ b/misc/tsearch.c
c6d234
@@ -300,10 +300,7 @@ weak_alias (__tsearch, tsearch)
c6d234
    KEY is the key to be located, ROOTP is the address of tree root,
c6d234
    COMPAR the ordering function.  */
c6d234
 void *
c6d234
-__tfind (key, vrootp, compar)
c6d234
-     const void *key;
c6d234
-     void *const *vrootp;
c6d234
-     __compar_fn_t compar;
c6d234
+__tfind (const void *key, void *const *vrootp, __compar_fn_t compar)
c6d234
 {
c6d234
   node *rootp = (node *) vrootp;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_destroy.c b/nptl/pthread_attr_destroy.c
c6d234
index c79752d89d05e158..ccdb5cc41f10bcdf 100644
c6d234
--- a/nptl/pthread_attr_destroy.c
c6d234
+++ b/nptl/pthread_attr_destroy.c
c6d234
@@ -24,8 +24,7 @@
c6d234
 #include <shlib-compat.h>
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_destroy (attr)
c6d234
-     pthread_attr_t *attr;
c6d234
+__pthread_attr_destroy (pthread_attr_t *attr)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getdetachstate.c b/nptl/pthread_attr_getdetachstate.c
c6d234
index 1c800323bf165a9d..601c5e77483bb5dc 100644
c6d234
--- a/nptl/pthread_attr_getdetachstate.c
c6d234
+++ b/nptl/pthread_attr_getdetachstate.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getdetachstate (attr, detachstate)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     int *detachstate;
c6d234
+__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getguardsize.c b/nptl/pthread_attr_getguardsize.c
c6d234
index 497010dc17002951..3fba0b8c548305f5 100644
c6d234
--- a/nptl/pthread_attr_getguardsize.c
c6d234
+++ b/nptl/pthread_attr_getguardsize.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_attr_getguardsize (attr, guardsize)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     size_t *guardsize;
c6d234
+pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getinheritsched.c b/nptl/pthread_attr_getinheritsched.c
c6d234
index b25d808247cd26f1..df2c31dfa5955677 100644
c6d234
--- a/nptl/pthread_attr_getinheritsched.c
c6d234
+++ b/nptl/pthread_attr_getinheritsched.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getinheritsched (attr, inherit)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     int *inherit;
c6d234
+__pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inherit)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getschedparam.c b/nptl/pthread_attr_getschedparam.c
c6d234
index 352ecb54f31e0cd5..f8a0b8be60bc059b 100644
c6d234
--- a/nptl/pthread_attr_getschedparam.c
c6d234
+++ b/nptl/pthread_attr_getschedparam.c
c6d234
@@ -22,9 +22,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getschedparam (attr, param)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     struct sched_param *param;
c6d234
+__pthread_attr_getschedparam (const pthread_attr_t *attr,
c6d234
+			      struct sched_param *param)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getschedpolicy.c b/nptl/pthread_attr_getschedpolicy.c
c6d234
index badec6b4e73ebe4c..4140876527bf833f 100644
c6d234
--- a/nptl/pthread_attr_getschedpolicy.c
c6d234
+++ b/nptl/pthread_attr_getschedpolicy.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getschedpolicy (attr, policy)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     int *policy;
c6d234
+__pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getscope.c b/nptl/pthread_attr_getscope.c
c6d234
index b2e1b141b6d109e9..fc79b8e95a779e99 100644
c6d234
--- a/nptl/pthread_attr_getscope.c
c6d234
+++ b/nptl/pthread_attr_getscope.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getscope (attr, scope)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     int *scope;
c6d234
+__pthread_attr_getscope (const pthread_attr_t *attr, int *scope)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getstack.c b/nptl/pthread_attr_getstack.c
c6d234
index 0ede9e77a1260997..df77a35380be68a4 100644
c6d234
--- a/nptl/pthread_attr_getstack.c
c6d234
+++ b/nptl/pthread_attr_getstack.c
c6d234
@@ -21,10 +21,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getstack (attr, stackaddr, stacksize)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     void **stackaddr;
c6d234
-     size_t *stacksize;
c6d234
+__pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
c6d234
+			 size_t *stacksize)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getstackaddr.c b/nptl/pthread_attr_getstackaddr.c
c6d234
index 958a856f5842c0c1..859eb7dec98568b7 100644
c6d234
--- a/nptl/pthread_attr_getstackaddr.c
c6d234
+++ b/nptl/pthread_attr_getstackaddr.c
c6d234
@@ -22,9 +22,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getstackaddr (attr, stackaddr)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     void **stackaddr;
c6d234
+__pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_getstacksize.c b/nptl/pthread_attr_getstacksize.c
c6d234
index 7c63e55942536cc3..53d65257ebdcd408 100644
c6d234
--- a/nptl/pthread_attr_getstacksize.c
c6d234
+++ b/nptl/pthread_attr_getstacksize.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_getstacksize (attr, stacksize)
c6d234
-     const pthread_attr_t *attr;
c6d234
-     size_t *stacksize;
c6d234
+__pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *stacksize)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_init.c b/nptl/pthread_attr_init.c
c6d234
index a7add4b80d248cc8..e5b800b72e100acf 100644
c6d234
--- a/nptl/pthread_attr_init.c
c6d234
+++ b/nptl/pthread_attr_init.c
c6d234
@@ -30,8 +30,7 @@ int __attr_list_lock = LLL_LOCK_INITIALIZER;
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_init_2_1 (attr)
c6d234
-     pthread_attr_t *attr;
c6d234
+__pthread_attr_init_2_1 (pthread_attr_t *attr)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
@@ -54,8 +53,7 @@ versioned_symbol (libpthread, __pthread_attr_init_2_1, pthread_attr_init,
c6d234
 
c6d234
 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
c6d234
 int
c6d234
-__pthread_attr_init_2_0 (attr)
c6d234
-     pthread_attr_t *attr;
c6d234
+__pthread_attr_init_2_0 (pthread_attr_t *attr)
c6d234
 {
c6d234
   /* This code is specific to the old LinuxThread code which has a too
c6d234
      small pthread_attr_t definition.  The struct looked like
c6d234
diff --git a/nptl/pthread_attr_setdetachstate.c b/nptl/pthread_attr_setdetachstate.c
c6d234
index 9ce8651f0b5906d3..9d22974536c07822 100644
c6d234
--- a/nptl/pthread_attr_setdetachstate.c
c6d234
+++ b/nptl/pthread_attr_setdetachstate.c
c6d234
@@ -22,9 +22,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setdetachstate (attr, detachstate)
c6d234
-     pthread_attr_t *attr;
c6d234
-     int detachstate;
c6d234
+__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setguardsize.c b/nptl/pthread_attr_setguardsize.c
c6d234
index b9f1436054577e15..475054642f406517 100644
c6d234
--- a/nptl/pthread_attr_setguardsize.c
c6d234
+++ b/nptl/pthread_attr_setguardsize.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_attr_setguardsize (attr, guardsize)
c6d234
-     pthread_attr_t *attr;
c6d234
-     size_t guardsize;
c6d234
+pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setinheritsched.c b/nptl/pthread_attr_setinheritsched.c
c6d234
index 2cc8c0ee06149f96..1107c64866f7e078 100644
c6d234
--- a/nptl/pthread_attr_setinheritsched.c
c6d234
+++ b/nptl/pthread_attr_setinheritsched.c
c6d234
@@ -22,9 +22,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setinheritsched (attr, inherit)
c6d234
-     pthread_attr_t *attr;
c6d234
-     int inherit;
c6d234
+__pthread_attr_setinheritsched (pthread_attr_t *attr, int inherit)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setschedparam.c b/nptl/pthread_attr_setschedparam.c
c6d234
index 239a41bfcc764903..ad7488688cc8d51d 100644
c6d234
--- a/nptl/pthread_attr_setschedparam.c
c6d234
+++ b/nptl/pthread_attr_setschedparam.c
c6d234
@@ -23,9 +23,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setschedparam (attr, param)
c6d234
-     pthread_attr_t *attr;
c6d234
-     const struct sched_param *param;
c6d234
+__pthread_attr_setschedparam (pthread_attr_t *attr,
c6d234
+			      const struct sched_param *param)
c6d234
 {
c6d234
   assert (sizeof (*attr) >= sizeof (struct pthread_attr));
c6d234
   struct pthread_attr *iattr = (struct pthread_attr *) attr;
c6d234
diff --git a/nptl/pthread_attr_setschedpolicy.c b/nptl/pthread_attr_setschedpolicy.c
c6d234
index 0ba38a022eb564bf..ccab923cabe9f20b 100644
c6d234
--- a/nptl/pthread_attr_setschedpolicy.c
c6d234
+++ b/nptl/pthread_attr_setschedpolicy.c
c6d234
@@ -22,9 +22,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setschedpolicy (attr, policy)
c6d234
-     pthread_attr_t *attr;
c6d234
-     int policy;
c6d234
+__pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setscope.c b/nptl/pthread_attr_setscope.c
c6d234
index eb03731cb2563e5a..62d250c4fdb34497 100644
c6d234
--- a/nptl/pthread_attr_setscope.c
c6d234
+++ b/nptl/pthread_attr_setscope.c
c6d234
@@ -22,9 +22,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setscope (attr, scope)
c6d234
-     pthread_attr_t *attr;
c6d234
-     int scope;
c6d234
+__pthread_attr_setscope (pthread_attr_t *attr, int scope)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setstack.c b/nptl/pthread_attr_setstack.c
c6d234
index 72eaee218474de88..e8c2b8515dc5912b 100644
c6d234
--- a/nptl/pthread_attr_setstack.c
c6d234
+++ b/nptl/pthread_attr_setstack.c
c6d234
@@ -28,10 +28,8 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setstack (attr, stackaddr, stacksize)
c6d234
-     pthread_attr_t *attr;
c6d234
-     void *stackaddr;
c6d234
-     size_t stacksize;
c6d234
+__pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr,
c6d234
+			 size_t stacksize)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setstackaddr.c b/nptl/pthread_attr_setstackaddr.c
c6d234
index b1a33d8c3f7043c3..e20eff61fa591364 100644
c6d234
--- a/nptl/pthread_attr_setstackaddr.c
c6d234
+++ b/nptl/pthread_attr_setstackaddr.c
c6d234
@@ -22,9 +22,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setstackaddr (attr, stackaddr)
c6d234
-     pthread_attr_t *attr;
c6d234
-     void *stackaddr;
c6d234
+__pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_attr_setstacksize.c b/nptl/pthread_attr_setstacksize.c
c6d234
index 954cc0f4d0b5a56e..890d3a492bc83030 100644
c6d234
--- a/nptl/pthread_attr_setstacksize.c
c6d234
+++ b/nptl/pthread_attr_setstacksize.c
c6d234
@@ -27,9 +27,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_attr_setstacksize (attr, stacksize)
c6d234
-     pthread_attr_t *attr;
c6d234
-     size_t stacksize;
c6d234
+__pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
c6d234
 {
c6d234
   struct pthread_attr *iattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_condattr_setclock.c b/nptl/pthread_condattr_setclock.c
c6d234
index 8b05dc84e923cf63..fd0b7328088e6f30 100644
c6d234
--- a/nptl/pthread_condattr_setclock.c
c6d234
+++ b/nptl/pthread_condattr_setclock.c
c6d234
@@ -26,9 +26,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_condattr_setclock (attr, clock_id)
c6d234
-     pthread_condattr_t *attr;
c6d234
-     clockid_t clock_id;
c6d234
+pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id)
c6d234
 {
c6d234
   /* Only a few clocks are allowed.  */
c6d234
   if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME)
c6d234
diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
c6d234
index 1083d6faacca5ab6..987469ba58e7bffa 100644
c6d234
--- a/nptl/pthread_create.c
c6d234
+++ b/nptl/pthread_create.c
c6d234
@@ -60,8 +60,7 @@ unsigned int __nptl_nthreads = 1;
c6d234
 
c6d234
 struct pthread *
c6d234
 internal_function
c6d234
-__find_in_stack_list (pd)
c6d234
-     struct pthread *pd;
c6d234
+__find_in_stack_list (struct pthread *pd)
c6d234
 {
c6d234
   list_t *entry;
c6d234
   struct pthread *result = NULL;
c6d234
diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
c6d234
index 72361c9f0497e048..8df7f6feb93ca0bb 100644
c6d234
--- a/nptl/pthread_getattr_np.c
c6d234
+++ b/nptl/pthread_getattr_np.c
c6d234
@@ -30,9 +30,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-pthread_getattr_np (thread_id, attr)
c6d234
-     pthread_t thread_id;
c6d234
-     pthread_attr_t *attr;
c6d234
+pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
c6d234
 {
c6d234
   struct pthread *thread = (struct pthread *) thread_id;
c6d234
   struct pthread_attr *iattr = (struct pthread_attr *) attr;
c6d234
diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c
c6d234
index 2979468fa516c587..0aec130f4d1754d9 100644
c6d234
--- a/nptl/pthread_mutex_init.c
c6d234
+++ b/nptl/pthread_mutex_init.c
c6d234
@@ -37,9 +37,8 @@ static int tpi_supported;
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_mutex_init (mutex, mutexattr)
c6d234
-     pthread_mutex_t *mutex;
c6d234
-     const pthread_mutexattr_t *mutexattr;
c6d234
+__pthread_mutex_init (pthread_mutex_t *mutex,
c6d234
+		      const pthread_mutexattr_t *mutexattr)
c6d234
 {
c6d234
   const struct pthread_mutexattr *imutexattr;
c6d234
 
c6d234
diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c
c6d234
index f8c9b217efbce91b..d17e6b5ea5947f6e 100644
c6d234
--- a/nptl/pthread_mutex_lock.c
c6d234
+++ b/nptl/pthread_mutex_lock.c
c6d234
@@ -58,8 +58,7 @@ static int __pthread_mutex_lock_full (pthread_mutex_t *mutex)
c6d234
      __attribute_noinline__;
c6d234
 
c6d234
 int
c6d234
-__pthread_mutex_lock (mutex)
c6d234
-     pthread_mutex_t *mutex;
c6d234
+__pthread_mutex_lock (pthread_mutex_t *mutex)
c6d234
 {
c6d234
   assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
c6d234
 
c6d234
@@ -517,8 +516,8 @@ hidden_def (__pthread_mutex_lock)
c6d234
 
c6d234
 #ifdef NO_INCR
c6d234
 void
c6d234
-__pthread_mutex_cond_lock_adjust (mutex)
c6d234
-     pthread_mutex_t *mutex;
c6d234
+internal_function
c6d234
+__pthread_mutex_cond_lock_adjust (pthread_mutex_t *mutex)
c6d234
 {
c6d234
   assert ((mutex->__data.__kind & PTHREAD_MUTEX_PRIO_INHERIT_NP) != 0);
c6d234
   assert ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0);
c6d234
diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
c6d234
index 7959885a244c6d95..f035b29f621cebd6 100644
c6d234
--- a/nptl/pthread_mutex_timedlock.c
c6d234
+++ b/nptl/pthread_mutex_timedlock.c
c6d234
@@ -38,9 +38,8 @@
c6d234
 #endif
c6d234
 
c6d234
 int
c6d234
-pthread_mutex_timedlock (mutex, abstime)
c6d234
-     pthread_mutex_t *mutex;
c6d234
-     const struct timespec *abstime;
c6d234
+pthread_mutex_timedlock (pthread_mutex_t *mutex,
c6d234
+			 const struct timespec *abstime)
c6d234
 {
c6d234
   int oldval;
c6d234
   pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
c6d234
diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
c6d234
index 7e96ec48f81dfc2c..40ba3e9fa9664756 100644
c6d234
--- a/nptl/pthread_mutex_trylock.c
c6d234
+++ b/nptl/pthread_mutex_trylock.c
c6d234
@@ -34,8 +34,7 @@
c6d234
    lock state if the lock was actually busy.  */
c6d234
 
c6d234
 int
c6d234
-__pthread_mutex_trylock (mutex)
c6d234
-     pthread_mutex_t *mutex;
c6d234
+__pthread_mutex_trylock (pthread_mutex_t *mutex)
c6d234
 {
c6d234
   int oldval;
c6d234
   pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
c6d234
diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c
c6d234
index 69e18f5057b5c6a5..27055ea7b2c8c493 100644
c6d234
--- a/nptl/pthread_mutex_unlock.c
c6d234
+++ b/nptl/pthread_mutex_unlock.c
c6d234
@@ -34,9 +34,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
c6d234
 
c6d234
 int
c6d234
 internal_function attribute_hidden
c6d234
-__pthread_mutex_unlock_usercnt (mutex, decr)
c6d234
-     pthread_mutex_t *mutex;
c6d234
-     int decr;
c6d234
+__pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr)
c6d234
 {
c6d234
   int type = PTHREAD_MUTEX_TYPE_ELISION (mutex);
c6d234
   if (__builtin_expect (type &
c6d234
@@ -304,8 +302,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
c6d234
 
c6d234
 
c6d234
 int
c6d234
-__pthread_mutex_unlock (mutex)
c6d234
-     pthread_mutex_t *mutex;
c6d234
+__pthread_mutex_unlock (pthread_mutex_t *mutex)
c6d234
 {
c6d234
   return __pthread_mutex_unlock_usercnt (mutex, 1);
c6d234
 }
c6d234
diff --git a/nptl/sysdeps/pthread/timer_delete.c b/nptl/sysdeps/pthread/timer_delete.c
c6d234
index a529d73925e9ed0d..546d19bf3f4a418a 100644
c6d234
--- a/nptl/sysdeps/pthread/timer_delete.c
c6d234
+++ b/nptl/sysdeps/pthread/timer_delete.c
c6d234
@@ -26,8 +26,7 @@
c6d234
 
c6d234
 /* Delete timer TIMERID.  */
c6d234
 int
c6d234
-timer_delete (timerid)
c6d234
-     timer_t timerid;
c6d234
+timer_delete (timer_t timerid)
c6d234
 {
c6d234
   struct timer_node *timer;
c6d234
   int retval = -1;
c6d234
diff --git a/nptl/sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c b/nptl/sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c
c6d234
index 7b6fbc18aa5f1153..2ac421fd63af3b75 100644
c6d234
--- a/nptl/sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c
c6d234
+++ b/nptl/sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c
c6d234
@@ -14,7 +14,7 @@
c6d234
 #define LLL_ROBUST_MUTEX_LOCK(mutex, id) \
c6d234
   lll_robust_cond_lock ((mutex)->__data.__lock, id, \
c6d234
 			PTHREAD_ROBUST_MUTEX_PSHARED (mutex))
c6d234
-#define __pthread_mutex_lock __pthread_mutex_cond_lock
c6d234
+#define __pthread_mutex_lock internal_function __pthread_mutex_cond_lock
c6d234
 #define __pthread_mutex_lock_full __pthread_mutex_cond_lock_full
c6d234
 #define NO_INCR
c6d234
 
c6d234
diff --git a/nptl_db/td_ta_clear_event.c b/nptl_db/td_ta_clear_event.c
c6d234
index 0c5f808496a0040b..74d22f964c80adb8 100644
c6d234
--- a/nptl_db/td_ta_clear_event.c
c6d234
+++ b/nptl_db/td_ta_clear_event.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 td_err_e
c6d234
-td_ta_clear_event (ta_arg, event)
c6d234
-     const td_thragent_t *ta_arg;
c6d234
-     td_thr_events_t *event;
c6d234
+td_ta_clear_event (const td_thragent_t *ta_arg, td_thr_events_t *event)
c6d234
 {
c6d234
   td_thragent_t *const ta = (td_thragent_t *) ta_arg;
c6d234
   td_err_e err;
c6d234
diff --git a/nptl_db/td_ta_set_event.c b/nptl_db/td_ta_set_event.c
c6d234
index e51e4b5c8762bf96..940b3472549406db 100644
c6d234
--- a/nptl_db/td_ta_set_event.c
c6d234
+++ b/nptl_db/td_ta_set_event.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 td_err_e
c6d234
-td_ta_set_event (ta_arg, event)
c6d234
-     const td_thragent_t *ta_arg;
c6d234
-     td_thr_events_t *event;
c6d234
+td_ta_set_event (const td_thragent_t *ta_arg, td_thr_events_t *event)
c6d234
 {
c6d234
   td_thragent_t *const ta = (td_thragent_t *) ta_arg;
c6d234
   td_err_e err;
c6d234
diff --git a/nptl_db/td_thr_clear_event.c b/nptl_db/td_thr_clear_event.c
c6d234
index 8ee9ac146aa8036b..4f2ccf3ae179dcc7 100644
c6d234
--- a/nptl_db/td_thr_clear_event.c
c6d234
+++ b/nptl_db/td_thr_clear_event.c
c6d234
@@ -23,9 +23,7 @@
c6d234
 
c6d234
 
c6d234
 td_err_e
c6d234
-td_thr_clear_event (th, event)
c6d234
-     const td_thrhandle_t *th;
c6d234
-     td_thr_events_t *event;
c6d234
+td_thr_clear_event (const td_thrhandle_t *th, td_thr_events_t *event)
c6d234
 {
c6d234
   td_err_e err;
c6d234
   psaddr_t eventmask;
c6d234
diff --git a/nptl_db/td_thr_event_enable.c b/nptl_db/td_thr_event_enable.c
c6d234
index fed7f70655092365..fd94580112ba3eb0 100644
c6d234
--- a/nptl_db/td_thr_event_enable.c
c6d234
+++ b/nptl_db/td_thr_event_enable.c
c6d234
@@ -21,9 +21,7 @@
c6d234
 
c6d234
 
c6d234
 td_err_e
c6d234
-td_thr_event_enable (th, onoff)
c6d234
-     const td_thrhandle_t *th;
c6d234
-     int onoff;
c6d234
+td_thr_event_enable (const td_thrhandle_t *th, int onoff)
c6d234
 {
c6d234
   LOG ("td_thr_event_enable");
c6d234
 
c6d234
diff --git a/nptl_db/td_thr_set_event.c b/nptl_db/td_thr_set_event.c
c6d234
index edc4efb35b78cf50..20989c5bfcddde3b 100644
c6d234
--- a/nptl_db/td_thr_set_event.c
c6d234
+++ b/nptl_db/td_thr_set_event.c
c6d234
@@ -23,9 +23,7 @@
c6d234
 
c6d234
 
c6d234
 td_err_e
c6d234
-td_thr_set_event (th, event)
c6d234
-     const td_thrhandle_t *th;
c6d234
-     td_thr_events_t *event;
c6d234
+td_thr_set_event (const td_thrhandle_t *th, td_thr_events_t *event)
c6d234
 {
c6d234
   td_err_e err;
c6d234
   psaddr_t eventmask;
c6d234
diff --git a/nss/makedb.c b/nss/makedb.c
c6d234
index e372f5d77e5273bc..9c96724fd214981d 100644
c6d234
--- a/nss/makedb.c
c6d234
+++ b/nss/makedb.c
c6d234
@@ -417,11 +417,7 @@ valstr_compare (const void *p1, const void *p2)
c6d234
 
c6d234
 
c6d234
 static int
c6d234
-process_input (input, inname, to_lowercase, be_quiet)
c6d234
-     FILE *input;
c6d234
-     const char *inname;
c6d234
-     int to_lowercase;
c6d234
-     int be_quiet;
c6d234
+process_input (FILE *input, const char *inname, int to_lowercase, int be_quiet)
c6d234
 {
c6d234
   char *line;
c6d234
   size_t linelen;
c6d234
diff --git a/posix/fnmatch.c b/posix/fnmatch.c
c6d234
index eed12b7b515e390c..107ba1010059c07f 100644
c6d234
--- a/posix/fnmatch.c
c6d234
+++ b/posix/fnmatch.c
c6d234
@@ -167,9 +167,7 @@ static int posixly_correct;
c6d234
 
c6d234
 # if !defined HAVE___STRCHRNUL && !defined _LIBC
c6d234
 static char *
c6d234
-__strchrnul (s, c)
c6d234
-     const char *s;
c6d234
-     int c;
c6d234
+__strchrnul (const char *s, int c)
c6d234
 {
c6d234
   char *result = strchr (s, c);
c6d234
   if (result == NULL)
c6d234
@@ -180,9 +178,7 @@ __strchrnul (s, c)
c6d234
 
c6d234
 # if HANDLE_MULTIBYTE && !defined HAVE___STRCHRNUL && !defined _LIBC
c6d234
 static wchar_t *
c6d234
-__wcschrnul (s, c)
c6d234
-     const wchar_t *s;
c6d234
-     wint_t c;
c6d234
+__wcschrnul (const wchar_t *s, wint_t c)
c6d234
 {
c6d234
   wchar_t *result = wcschr (s, c);
c6d234
   if (result == NULL)
c6d234
@@ -320,10 +316,7 @@ is_char_class (const wchar_t *wcs)
c6d234
 
c6d234
 
c6d234
 int
c6d234
-fnmatch (pattern, string, flags)
c6d234
-     const char *pattern;
c6d234
-     const char *string;
c6d234
-     int flags;
c6d234
+fnmatch (const char *pattern, const char *string, int flags)
c6d234
 {
c6d234
 # if HANDLE_MULTIBYTE
c6d234
   if (__builtin_expect (MB_CUR_MAX, 1) != 1)
c6d234
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
c6d234
index 2bd788f3942c6e7d..da1fe0c987f21942 100644
c6d234
--- a/posix/fnmatch_loop.c
c6d234
+++ b/posix/fnmatch_loop.c
c6d234
@@ -37,14 +37,8 @@ static const CHAR *END (const CHAR *patternp) internal_function;
c6d234
 
c6d234
 static int
c6d234
 internal_function
c6d234
-FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
c6d234
-     const CHAR *pattern;
c6d234
-     const CHAR *string;
c6d234
-     const CHAR *string_end;
c6d234
-     int no_leading_period;
c6d234
-     int flags;
c6d234
-     struct STRUCT *ends;
c6d234
-     size_t alloca_used;
c6d234
+FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
c6d234
+     int no_leading_period, int flags, struct STRUCT *ends, size_t alloca_used)
c6d234
 {
c6d234
   const CHAR *p = pattern, *n = string;
c6d234
   UCHAR c;
c6d234
diff --git a/posix/glob.c b/posix/glob.c
c6d234
index 8c7a80085128475a..e3d6fe0f15f7d9ce 100644
c6d234
--- a/posix/glob.c
c6d234
+++ b/posix/glob.c
c6d234
@@ -1263,8 +1263,7 @@ libc_hidden_def (glob)
c6d234
 
c6d234
 /* Free storage allocated in PGLOB by a previous `glob' call.  */
c6d234
 void
c6d234
-globfree (pglob)
c6d234
-     glob_t *pglob;
c6d234
+globfree (glob_t *pglob)
c6d234
 {
c6d234
   if (pglob->gl_pathv != NULL)
c6d234
     {
c6d234
@@ -1359,9 +1358,7 @@ prefix_array (const char *dirname, char **array, size_t n)
c6d234
 /* We must not compile this function twice.  */
c6d234
 #if !defined _LIBC || !defined NO_GLOB_PATTERN_P
c6d234
 int
c6d234
-__glob_pattern_type (pattern, quote)
c6d234
-     const char *pattern;
c6d234
-     int quote;
c6d234
+__glob_pattern_type (const char *pattern, int quote)
c6d234
 {
c6d234
   const char *p;
c6d234
   int ret = 0;
c6d234
@@ -1398,9 +1395,7 @@ __glob_pattern_type (pattern, quote)
c6d234
 /* Return nonzero if PATTERN contains any metacharacters.
c6d234
    Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
c6d234
 int
c6d234
-__glob_pattern_p (pattern, quote)
c6d234
-     const char *pattern;
c6d234
-     int quote;
c6d234
+__glob_pattern_p (const char *pattern, int quote)
c6d234
 {
c6d234
   return __glob_pattern_type (pattern, quote) == 1;
c6d234
 }
c6d234
diff --git a/posix/regcomp.c b/posix/regcomp.c
c6d234
index 99fee76b8a8cbb12..80359e58db504ed6 100644
c6d234
--- a/posix/regcomp.c
c6d234
+++ b/posix/regcomp.c
c6d234
@@ -210,10 +210,8 @@ const size_t __re_error_msgid_idx[] attribute_hidden =
c6d234
    are set in BUFP on entry.  */
c6d234
 
c6d234
 const char *
c6d234
-re_compile_pattern (pattern, length, bufp)
c6d234
-    const char *pattern;
c6d234
-    size_t length;
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
+re_compile_pattern (const char *pattern, size_t length,
c6d234
+		    struct re_pattern_buffer *bufp)
c6d234
 {
c6d234
   reg_errcode_t ret;
c6d234
 
c6d234
@@ -251,8 +249,7 @@ reg_syntax_t re_syntax_options;
c6d234
    defined in regex.h.  We return the old syntax.  */
c6d234
 
c6d234
 reg_syntax_t
c6d234
-re_set_syntax (syntax)
c6d234
-    reg_syntax_t syntax;
c6d234
+re_set_syntax (reg_syntax_t syntax)
c6d234
 {
c6d234
   reg_syntax_t ret = re_syntax_options;
c6d234
 
c6d234
@@ -264,8 +261,7 @@ weak_alias (__re_set_syntax, re_set_syntax)
c6d234
 #endif
c6d234
 
c6d234
 int
c6d234
-re_compile_fastmap (bufp)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
+re_compile_fastmap (struct re_pattern_buffer *bufp)
c6d234
 {
c6d234
   re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
c6d234
   char *fastmap = bufp->fastmap;
c6d234
@@ -463,10 +459,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
c6d234
    the return codes and their meanings.)  */
c6d234
 
c6d234
 int
c6d234
-regcomp (preg, pattern, cflags)
c6d234
-    regex_t *__restrict preg;
c6d234
-    const char *__restrict pattern;
c6d234
-    int cflags;
c6d234
+regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags)
c6d234
 {
c6d234
   reg_errcode_t ret;
c6d234
   reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
c6d234
@@ -525,11 +518,8 @@ weak_alias (__regcomp, regcomp)
c6d234
    from either regcomp or regexec.   We don't use PREG here.  */
c6d234
 
c6d234
 size_t
c6d234
-regerror (errcode, preg, errbuf, errbuf_size)
c6d234
-    int errcode;
c6d234
-    const regex_t *__restrict preg;
c6d234
-    char *__restrict errbuf;
c6d234
-    size_t errbuf_size;
c6d234
+regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
c6d234
+	  size_t errbuf_size)
c6d234
 {
c6d234
   const char *msg;
c6d234
   size_t msg_size;
c6d234
@@ -633,8 +623,7 @@ free_dfa_content (re_dfa_t *dfa)
c6d234
 /* Free dynamically allocated space used by PREG.  */
c6d234
 
c6d234
 void
c6d234
-regfree (preg)
c6d234
-    regex_t *preg;
c6d234
+regfree (regex_t *preg)
c6d234
 {
c6d234
   re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
c6d234
   if (BE (dfa != NULL, 1))
c6d234
diff --git a/posix/regexec.c b/posix/regexec.c
c6d234
index 5b31f5bbd7e5115a..f315149af88ac6bb 100644
c6d234
--- a/posix/regexec.c
c6d234
+++ b/posix/regexec.c
c6d234
@@ -217,12 +217,8 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
c6d234
    We return 0 if we find a match and REG_NOMATCH if not.  */
c6d234
 
c6d234
 int
c6d234
-regexec (preg, string, nmatch, pmatch, eflags)
c6d234
-    const regex_t *__restrict preg;
c6d234
-    const char *__restrict string;
c6d234
-    size_t nmatch;
c6d234
-    regmatch_t pmatch[];
c6d234
-    int eflags;
c6d234
+regexec (const regex_t *__restrict preg, const char *__restrict string,
c6d234
+	 size_t nmatch, regmatch_t pmatch[], int eflags)
c6d234
 {
c6d234
   reg_errcode_t err;
c6d234
   int start, length;
c6d234
@@ -303,11 +299,8 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
c6d234
    match was found and -2 indicates an internal error.  */
c6d234
 
c6d234
 int
c6d234
-re_match (bufp, string, length, start, regs)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
-    const char *string;
c6d234
-    int length, start;
c6d234
-    struct re_registers *regs;
c6d234
+re_match (struct re_pattern_buffer *bufp, const char *string, int length,
c6d234
+	  int start, struct re_registers *regs)
c6d234
 {
c6d234
   return re_search_stub (bufp, string, length, start, 0, length, regs, 1);
c6d234
 }
c6d234
@@ -316,11 +309,8 @@ weak_alias (__re_match, re_match)
c6d234
 #endif
c6d234
 
c6d234
 int
c6d234
-re_search (bufp, string, length, start, range, regs)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
-    const char *string;
c6d234
-    int length, start, range;
c6d234
-    struct re_registers *regs;
c6d234
+re_search (struct re_pattern_buffer *bufp, const char *string, int length,
c6d234
+	   int start, int range, struct re_registers *regs)
c6d234
 {
c6d234
   return re_search_stub (bufp, string, length, start, range, length, regs, 0);
c6d234
 }
c6d234
@@ -329,11 +319,9 @@ weak_alias (__re_search, re_search)
c6d234
 #endif
c6d234
 
c6d234
 int
c6d234
-re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
-    const char *string1, *string2;
c6d234
-    int length1, length2, start, stop;
c6d234
-    struct re_registers *regs;
c6d234
+re_match_2 (struct re_pattern_buffer *bufp, const char *string1, int length1,
c6d234
+	    const char *string2, int length2, int start,
c6d234
+	    struct re_registers *regs, int stop)
c6d234
 {
c6d234
   return re_search_2_stub (bufp, string1, length1, string2, length2,
c6d234
 			   start, 0, regs, stop, 1);
c6d234
@@ -343,11 +331,9 @@ weak_alias (__re_match_2, re_match_2)
c6d234
 #endif
c6d234
 
c6d234
 int
c6d234
-re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
-    const char *string1, *string2;
c6d234
-    int length1, length2, start, range, stop;
c6d234
-    struct re_registers *regs;
c6d234
+re_search_2 (struct re_pattern_buffer *bufp, const char *string1, int length1,
c6d234
+	     const char *string2, int length2, int start, int range,
c6d234
+	     struct re_registers *regs, int stop)
c6d234
 {
c6d234
   return re_search_2_stub (bufp, string1, length1, string2, length2,
c6d234
 			   start, range, regs, stop, 0);
c6d234
@@ -404,11 +390,10 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs,
c6d234
    otherwise the position of the match is returned.  */
c6d234
 
c6d234
 static int
c6d234
-re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
-    const char *string;
c6d234
-    int length, start, range, stop, ret_len;
c6d234
-    struct re_registers *regs;
c6d234
+internal_function
c6d234
+re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length,
c6d234
+		int start, int range, int stop, struct re_registers *regs,
c6d234
+		int ret_len)
c6d234
 {
c6d234
   reg_errcode_t result;
c6d234
   regmatch_t *pmatch;
c6d234
@@ -493,10 +478,9 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
c6d234
 }
c6d234
 
c6d234
 static unsigned
c6d234
-re_copy_regs (regs, pmatch, nregs, regs_allocated)
c6d234
-    struct re_registers *regs;
c6d234
-    regmatch_t *pmatch;
c6d234
-    int nregs, regs_allocated;
c6d234
+internal_function
c6d234
+re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs,
c6d234
+	      int regs_allocated)
c6d234
 {
c6d234
   int rval = REGS_REALLOCATE;
c6d234
   int i;
c6d234
@@ -573,11 +557,8 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated)
c6d234
    freeing the old data.  */
c6d234
 
c6d234
 void
c6d234
-re_set_registers (bufp, regs, num_regs, starts, ends)
c6d234
-    struct re_pattern_buffer *bufp;
c6d234
-    struct re_registers *regs;
c6d234
-    unsigned num_regs;
c6d234
-    regoff_t *starts, *ends;
c6d234
+re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs,
c6d234
+		  unsigned num_regs, regoff_t *starts, regoff_t *ends)
c6d234
 {
c6d234
   if (num_regs)
c6d234
     {
c6d234
@@ -951,9 +932,8 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch,
c6d234
 }
c6d234
 
c6d234
 static reg_errcode_t
c6d234
-__attribute_warn_unused_result__
c6d234
-prune_impossible_nodes (mctx)
c6d234
-     re_match_context_t *mctx;
c6d234
+internal_function __attribute_warn_unused_result__
c6d234
+prune_impossible_nodes (re_match_context_t *mctx)
c6d234
 {
c6d234
   const re_dfa_t *const dfa = mctx->dfa;
c6d234
   int halt_node, match_last;
c6d234
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
c6d234
index 2047203a4cee1111..e5b30d443106ee91 100644
c6d234
--- a/stdlib/strtod_l.c
c6d234
+++ b/stdlib/strtod_l.c
c6d234
@@ -472,11 +472,8 @@ __mpn_lshift_1 (mp_limb_t *ptr, mp_size_t size, unsigned int count,
c6d234
    return 0.0.  If the number is too big to be represented, set `errno' to
c6d234
    ERANGE and return HUGE_VAL with the appropriate sign.  */
c6d234
 FLOAT
c6d234
-____STRTOF_INTERNAL (nptr, endptr, group, loc)
c6d234
-     const STRING_TYPE *nptr;
c6d234
-     STRING_TYPE **endptr;
c6d234
-     int group;
c6d234
-     __locale_t loc;
c6d234
+____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group,
c6d234
+		     __locale_t loc)
c6d234
 {
c6d234
   int negative;			/* The sign of the number.  */
c6d234
   MPN_VAR (num);		/* MP representation of the number.  */
c6d234
diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c
c6d234
index e405e66cdf40951d..e6170a4fd82895a9 100644
c6d234
--- a/sysdeps/pthread/aio_cancel.c
c6d234
+++ b/sysdeps/pthread/aio_cancel.c
c6d234
@@ -38,9 +38,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-aio_cancel (fildes, aiocbp)
c6d234
-     int fildes;
c6d234
-     struct aiocb *aiocbp;
c6d234
+aio_cancel (int fildes, struct aiocb *aiocbp)
c6d234
 {
c6d234
   struct requestlist *req = NULL;
c6d234
   int result = AIO_ALLDONE;
c6d234
diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c
c6d234
index 9d3c8f996a2839ad..27d6d24e6610d98b 100644
c6d234
--- a/sysdeps/pthread/aio_suspend.c
c6d234
+++ b/sysdeps/pthread/aio_suspend.c
c6d234
@@ -105,10 +105,8 @@ do_aio_misc_wait(int *cntr, const struct timespec *timeout)
c6d234
 #endif
c6d234
 
c6d234
 int
c6d234
-aio_suspend (list, nent, timeout)
c6d234
-     const struct aiocb *const list[];
c6d234
-     int nent;
c6d234
-     const struct timespec *timeout;
c6d234
+aio_suspend (const struct aiocb *const list[], int nent,
c6d234
+	     const struct timespec *timeout)
c6d234
 {
c6d234
   if (__builtin_expect (nent < 0, 0))
c6d234
     {
c6d234
diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
c6d234
index 69f02f65b1cca130..673eb1dde673370a 100644
c6d234
--- a/sysdeps/unix/sysv/linux/dl-openat64.c
c6d234
+++ b/sysdeps/unix/sysv/linux/dl-openat64.c
c6d234
@@ -23,10 +23,7 @@
c6d234
 
c6d234
 
c6d234
 int
c6d234
-openat64 (dfd, file, oflag)
c6d234
-     int dfd;
c6d234
-     const char *file;
c6d234
-     int oflag;
c6d234
+openat64 (int dfd, const char *file, int oflag, ...)
c6d234
 {
c6d234
   assert (!__OPEN_NEEDS_MODE (oflag));
c6d234
 
c6d234
diff --git a/time/strptime_l.c b/time/strptime_l.c
c6d234
index 14d50a2e879a2c5c..cb2b8faa6d740748 100644
c6d234
--- a/time/strptime_l.c
c6d234
+++ b/time/strptime_l.c
c6d234
@@ -41,9 +41,7 @@
c6d234
 #  define localtime_r my_localtime_r
c6d234
 static struct tm *localtime_r (const time_t *, struct tm *);
c6d234
 static struct tm *
c6d234
-localtime_r (t, tp)
c6d234
-     const time_t *t;
c6d234
-     struct tm *tp;
c6d234
+localtime_r (const time_t *t, struct tm *tp)
c6d234
 {
c6d234
   struct tm *l = localtime (t);
c6d234
   if (! l)
c6d234
diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
c6d234
index fc8396c00dc074a4..36cfed0a010f2873 100644
c6d234
--- a/wcsmbs/mbsnrtowcs.c
c6d234
+++ b/wcsmbs/mbsnrtowcs.c
c6d234
@@ -38,12 +38,8 @@ static mbstate_t state;
c6d234
    implementation of stdio because we have to deal with unterminated
c6d234
    buffers.  At most NMC bytes will be converted.  */
c6d234
 size_t
c6d234
-__mbsnrtowcs (dst, src, nmc, len, ps)
c6d234
-     wchar_t *dst;
c6d234
-     const char **src;
c6d234
-     size_t nmc;
c6d234
-     size_t len;
c6d234
-     mbstate_t *ps;
c6d234
+__mbsnrtowcs (wchar_t *dst, const char **src, size_t nmc, size_t len,
c6d234
+	      mbstate_t *ps)
c6d234
 {
c6d234
   const unsigned char *srcend;
c6d234
   struct __gconv_step_data data;
c6d234
diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c
c6d234
index d489266d38bddfd5..ec8b7bebb0a2cc9a 100644
c6d234
--- a/wcsmbs/mbsrtowcs_l.c
c6d234
+++ b/wcsmbs/mbsrtowcs_l.c
c6d234
@@ -37,12 +37,8 @@
c6d234
 
c6d234
 size_t
c6d234
 attribute_hidden
c6d234
-__mbsrtowcs_l (dst, src, len, ps, l)
c6d234
-     wchar_t *dst;
c6d234
-     const char **src;
c6d234
-     size_t len;
c6d234
-     mbstate_t *ps;
c6d234
-     __locale_t l;
c6d234
+__mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, mbstate_t *ps,
c6d234
+	       __locale_t l)
c6d234
 {
c6d234
   struct __gconv_step_data data;
c6d234
   size_t result;
c6d234
diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
c6d234
index e5e5db86b57fee44..7c0efad7a27c2920 100644
c6d234
--- a/wcsmbs/wcsnrtombs.c
c6d234
+++ b/wcsmbs/wcsnrtombs.c
c6d234
@@ -37,12 +37,8 @@ static mbstate_t state;
c6d234
    implementation of stdio because we have to deal with unterminated
c6d234
    buffers.  At most NWC wide character will be converted.  */
c6d234
 size_t
c6d234
-__wcsnrtombs (dst, src, nwc, len, ps)
c6d234
-     char *dst;
c6d234
-     const wchar_t **src;
c6d234
-     size_t nwc;
c6d234
-     size_t len;
c6d234
-     mbstate_t *ps;
c6d234
+__wcsnrtombs (char *dst, const wchar_t **src, size_t nwc, size_t len,
c6d234
+	      mbstate_t *ps)
c6d234
 {
c6d234
   struct __gconv_step_data data;
c6d234
   const wchar_t *srcend;
c6d234
diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
c6d234
index dfb28d31254ec201..ab843f6dc47edc52 100644
c6d234
--- a/wcsmbs/wcsrtombs.c
c6d234
+++ b/wcsmbs/wcsrtombs.c
c6d234
@@ -35,11 +35,7 @@
c6d234
 static mbstate_t state;
c6d234
 
c6d234
 size_t
c6d234
-__wcsrtombs (dst, src, len, ps)
c6d234
-     char *dst;
c6d234
-     const wchar_t **src;
c6d234
-     size_t len;
c6d234
-     mbstate_t *ps;
c6d234
+__wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
c6d234
 {
c6d234
   struct __gconv_step_data data;
c6d234
   int status;