wok-current diff glibc/stuff/glibc-2.21-gcc6_fix-2.patch @ rev 25785
Mass rebuild after bump to glibc 2.31, add epson printer and scanner package
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Tue Jul 15 20:40:17 2025 +0000 (3 months ago) |
| parents | |
| children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/glibc/stuff/glibc-2.21-gcc6_fix-2.patch Tue Jul 15 20:40:17 2025 +0000 1.3 @@ -0,0 +1,2016 @@ 1.4 +From 9dd346ff431fc761f1b748bd4da8bb59f7652094 Mon Sep 17 00:00:00 2001 1.5 +From: Joseph Myers <joseph@codesourcery.com> 1.6 +Date: Tue, 20 Oct 2015 11:54:09 +0000 1.7 +Subject: [PATCH] Convert 113 more function definitions to prototype style 1.8 + (files with assertions). 1.9 + 1.10 +This mostly automatically-generated patch converts 113 function 1.11 +definitions in glibc from old-style K&R to prototype-style. Following 1.12 +my other recent such patches, this one deals with the case of function 1.13 +definitions in files that either contain assertions or where grep 1.14 +suggested they might contain assertions - and thus where it isn't 1.15 +possible to use a simple object code comparison as a sanity check on 1.16 +the correctness of the patch, because line numbers are changed. 1.17 + 1.18 +A few such automatically-generated changes needed to be supplemented 1.19 +by manual changes for the result to compile. openat64 had a prototype 1.20 +declaration with "..." but an old-style definition in 1.21 +sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the 1.22 +generated prototype in the definition (I've filed 1.23 +<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing 1.24 +such cases in GCC; the old state was undefined behavior not requiring 1.25 +a diagnostic, but one seems a good idea). In addition, as Florian has 1.26 +noted regparm attribute mismatches between declaration and definition 1.27 +are only diagnosed for prototype definitions, and five functions 1.28 +needed internal_function added to their definitions (in the case of 1.29 +__pthread_mutex_cond_lock, via the macro definition of 1.30 +__pthread_mutex_lock) to compile on i386. 1.31 + 1.32 +After this patch is in, remaining old-style definitions are probably 1.33 +most readily fixed manually before we can turn on 1.34 +-Wold-style-definition for all builds. 1.35 + 1.36 +Tested for x86_64 and x86 (testsuite). 1.37 + 1.38 + * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style 1.39 + function definition. 1.40 + * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise. 1.41 + * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise. 1.42 + * debug/backtracesyms.c (__backtrace_symbols): Likewise. 1.43 + * elf/dl-minimal.c (_itoa): Likewise. 1.44 + * hurd/hurdmalloc.c (malloc): Likewise. 1.45 + (free): Likewise. 1.46 + (realloc): Likewise. 1.47 + * inet/inet6_option.c (inet6_option_space): Likewise. 1.48 + (inet6_option_init): Likewise. 1.49 + (inet6_option_append): Likewise. 1.50 + (inet6_option_alloc): Likewise. 1.51 + (inet6_option_next): Likewise. 1.52 + (inet6_option_find): Likewise. 1.53 + * io/ftw.c (FTW_NAME): Likewise. 1.54 + (NFTW_NAME): Likewise. 1.55 + (NFTW_NEW_NAME): Likewise. 1.56 + (NFTW_OLD_NAME): Likewise. 1.57 + * libio/iofwide.c (_IO_fwide): Likewise. 1.58 + * libio/strops.c (_IO_str_init_static_internal): Likewise. 1.59 + (_IO_str_init_static): Likewise. 1.60 + (_IO_str_init_readonly): Likewise. 1.61 + (_IO_str_overflow): Likewise. 1.62 + (_IO_str_underflow): Likewise. 1.63 + (_IO_str_count): Likewise. 1.64 + (_IO_str_seekoff): Likewise. 1.65 + (_IO_str_pbackfail): Likewise. 1.66 + (_IO_str_finish): Likewise. 1.67 + * libio/wstrops.c (_IO_wstr_init_static): Likewise. 1.68 + (_IO_wstr_overflow): Likewise. 1.69 + (_IO_wstr_underflow): Likewise. 1.70 + (_IO_wstr_count): Likewise. 1.71 + (_IO_wstr_seekoff): Likewise. 1.72 + (_IO_wstr_pbackfail): Likewise. 1.73 + (_IO_wstr_finish): Likewise. 1.74 + * locale/programs/localedef.c (normalize_codeset): Likewise. 1.75 + * locale/programs/locarchive.c (add_locale_to_archive): Likewise. 1.76 + (add_locales_to_archive): Likewise. 1.77 + (delete_locales_from_archive): Likewise. 1.78 + * malloc/malloc.c (__libc_mallinfo): Likewise. 1.79 + * math/gen-auto-libm-tests.c (init_fp_formats): Likewise. 1.80 + * misc/tsearch.c (__tfind): Likewise. 1.81 + * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise. 1.82 + * nptl/pthread_attr_getdetachstate.c 1.83 + (__pthread_attr_getdetachstate): Likewise. 1.84 + * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize): 1.85 + Likewise. 1.86 + * nptl/pthread_attr_getinheritsched.c 1.87 + (__pthread_attr_getinheritsched): Likewise. 1.88 + * nptl/pthread_attr_getschedparam.c 1.89 + (__pthread_attr_getschedparam): Likewise. 1.90 + * nptl/pthread_attr_getschedpolicy.c 1.91 + (__pthread_attr_getschedpolicy): Likewise. 1.92 + * nptl/pthread_attr_getscope.c (__pthread_attr_getscope): 1.93 + Likewise. 1.94 + * nptl/pthread_attr_getstack.c (__pthread_attr_getstack): 1.95 + Likewise. 1.96 + * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr): 1.97 + Likewise. 1.98 + * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize): 1.99 + Likewise. 1.100 + * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise. 1.101 + (__pthread_attr_init_2_0): Likewise. 1.102 + * nptl/pthread_attr_setdetachstate.c 1.103 + (__pthread_attr_setdetachstate): Likewise. 1.104 + * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize): 1.105 + Likewise. 1.106 + * nptl/pthread_attr_setinheritsched.c 1.107 + (__pthread_attr_setinheritsched): Likewise. 1.108 + * nptl/pthread_attr_setschedparam.c 1.109 + (__pthread_attr_setschedparam): Likewise. 1.110 + * nptl/pthread_attr_setschedpolicy.c 1.111 + (__pthread_attr_setschedpolicy): Likewise. 1.112 + * nptl/pthread_attr_setscope.c (__pthread_attr_setscope): 1.113 + Likewise. 1.114 + * nptl/pthread_attr_setstack.c (__pthread_attr_setstack): 1.115 + Likewise. 1.116 + * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr): 1.117 + Likewise. 1.118 + * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize): 1.119 + Likewise. 1.120 + * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock): 1.121 + Likewise. 1.122 + * nptl/pthread_create.c (__find_in_stack_list): Likewise. 1.123 + * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise. 1.124 + * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to 1.125 + use internal_function. 1.126 + * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to 1.127 + prototype-style function definition. 1.128 + * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. 1.129 + (__pthread_mutex_cond_lock_adjust): Likewise. Use 1.130 + internal_function. 1.131 + * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): 1.132 + Convert to prototype-style function definition. 1.133 + * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): 1.134 + Likewise. 1.135 + * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): 1.136 + Likewise. 1.137 + (__pthread_mutex_unlock): Likewise. 1.138 + * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise. 1.139 + * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise. 1.140 + * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise. 1.141 + * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise. 1.142 + * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise. 1.143 + * nss/makedb.c (process_input): Likewise. 1.144 + * posix/fnmatch.c (__strchrnul): Likewise. 1.145 + (__wcschrnul): Likewise. 1.146 + (fnmatch): Likewise. 1.147 + * posix/fnmatch_loop.c (FCT): Likewise. 1.148 + * posix/glob.c (globfree): Likewise. 1.149 + (__glob_pattern_type): Likewise. 1.150 + (__glob_pattern_p): Likewise. 1.151 + * posix/regcomp.c (re_compile_pattern): Likewise. 1.152 + (re_set_syntax): Likewise. 1.153 + (re_compile_fastmap): Likewise. 1.154 + (regcomp): Likewise. 1.155 + (regerror): Likewise. 1.156 + (regfree): Likewise. 1.157 + * posix/regexec.c (regexec): Likewise. 1.158 + (re_match): Likewise. 1.159 + (re_search): Likewise. 1.160 + (re_match_2): Likewise. 1.161 + (re_search_2): Likewise. 1.162 + (re_search_stub): Likewise. Use internal_function 1.163 + (re_copy_regs): Likewise. 1.164 + (re_set_registers): Convert to prototype-style function 1.165 + definition. 1.166 + (prune_impossible_nodes): Likewise. Use internal_function. 1.167 + * resolv/inet_net_pton.c (inet_net_pton): Convert to 1.168 + prototype-style function definition. 1.169 + (inet_net_pton_ipv4): Likewise. 1.170 + * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise. 1.171 + * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise. 1.172 + * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise. 1.173 + * sysdeps/pthread/timer_delete.c (timer_delete): Likewise. 1.174 + * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise. 1.175 + Make variadic. 1.176 + * time/strptime_l.c (localtime_r): Convert to prototype-style 1.177 + function definition. 1.178 + * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise. 1.179 + * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise. 1.180 + * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise. 1.181 + * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise. 1.182 +--- 1.183 + ChangeLog | 145 ++++++++++++++++++++++++++ 1.184 + crypt/md5-crypt.c | 6 +- 1.185 + crypt/sha256-crypt.c | 6 +- 1.186 + crypt/sha512-crypt.c | 6 +- 1.187 + debug/backtracesyms.c | 4 +- 1.188 + elf/dl-minimal.c | 7 +- 1.189 + hurd/hurdmalloc.c | 10 +- 1.190 + inet/inet6_option.c | 30 ++---- 1.191 + io/ftw.c | 23 +--- 1.192 + libio/iofwide.c | 4 +- 1.193 + libio/strops.c | 42 ++------ 1.194 + libio/wstrops.c | 31 ++---- 1.195 + locale/programs/localedef.c | 4 +- 1.196 + locale/programs/locarchive.c | 16 +-- 1.197 + malloc/malloc.c | 2 +- 1.198 + math/gen-auto-libm-tests.c | 2 +- 1.199 + misc/tsearch.c | 5 +- 1.200 + nptl/pthread_attr_destroy.c | 3 +- 1.201 + nptl/pthread_attr_getdetachstate.c | 4 +- 1.202 + nptl/pthread_attr_getguardsize.c | 4 +- 1.203 + nptl/pthread_attr_getinheritsched.c | 4 +- 1.204 + nptl/pthread_attr_getschedparam.c | 5 +- 1.205 + nptl/pthread_attr_getschedpolicy.c | 4 +- 1.206 + nptl/pthread_attr_getscope.c | 4 +- 1.207 + nptl/pthread_attr_getstack.c | 6 +- 1.208 + nptl/pthread_attr_getstackaddr.c | 4 +- 1.209 + nptl/pthread_attr_getstacksize.c | 4 +- 1.210 + nptl/pthread_attr_init.c | 6 +- 1.211 + nptl/pthread_attr_setdetachstate.c | 4 +- 1.212 + nptl/pthread_attr_setguardsize.c | 4 +- 1.213 + nptl/pthread_attr_setinheritsched.c | 4 +- 1.214 + nptl/pthread_attr_setschedparam.c | 5 +- 1.215 + nptl/pthread_attr_setschedpolicy.c | 4 +- 1.216 + nptl/pthread_attr_setscope.c | 4 +- 1.217 + nptl/pthread_attr_setstack.c | 6 +- 1.218 + nptl/pthread_attr_setstackaddr.c | 4 +- 1.219 + nptl/pthread_attr_setstacksize.c | 4 +- 1.220 + nptl/pthread_condattr_setclock.c | 4 +- 1.221 + nptl/pthread_create.c | 3 +- 1.222 + nptl/pthread_getattr_np.c | 4 +- 1.223 + nptl/pthread_mutex_cond_lock.c | 2 +- 1.224 + nptl/pthread_mutex_init.c | 5 +- 1.225 + nptl/pthread_mutex_lock.c | 7 +- 1.226 + nptl/pthread_mutex_timedlock.c | 5 +- 1.227 + nptl/pthread_mutex_trylock.c | 3 +- 1.228 + nptl/pthread_mutex_unlock.c | 7 +- 1.229 + nptl_db/td_ta_clear_event.c | 4 +- 1.230 + nptl_db/td_ta_set_event.c | 4 +- 1.231 + nptl_db/td_thr_clear_event.c | 4 +- 1.232 + nptl_db/td_thr_event_enable.c | 4 +- 1.233 + nptl_db/td_thr_set_event.c | 4 +- 1.234 + nss/makedb.c | 6 +- 1.235 + posix/fnmatch.c | 13 +-- 1.236 + posix/fnmatch_loop.c | 10 +- 1.237 + posix/glob.c | 11 +- 1.238 + posix/regcomp.c | 27 ++--- 1.239 + posix/regexec.c | 66 ++++-------- 1.240 + resolv/inet_net_pton.c | 11 +- 1.241 + stdlib/strtod_l.c | 7 +- 1.242 + sysdeps/pthread/aio_cancel.c | 4 +- 1.243 + sysdeps/pthread/aio_suspend.c | 6 +- 1.244 + sysdeps/pthread/timer_delete.c | 3 +- 1.245 + sysdeps/unix/sysv/linux/dl-openat64.c | 5 +- 1.246 + time/strptime_l.c | 4 +- 1.247 + wcsmbs/mbsnrtowcs.c | 8 +- 1.248 + wcsmbs/mbsrtowcs_l.c | 8 +- 1.249 + wcsmbs/wcsnrtombs.c | 8 +- 1.250 + wcsmbs/wcsrtombs.c | 6 +- 1.251 + 68 files changed, 293 insertions(+), 400 deletions(-) 1.252 + 1.253 +diff --git a/ChangeLog b/ChangeLog 1.254 +index 685fad5a8e..9e7c455c56 100644 1.255 +--- a/ChangeLog 1.256 ++++ b/ChangeLog 1.257 +@@ -1,5 +1,150 @@ 1.258 + 2015-10-20 Joseph Myers <joseph@codesourcery.com> 1.259 + 1.260 ++ * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style 1.261 ++ function definition. 1.262 ++ * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise. 1.263 ++ * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise. 1.264 ++ * debug/backtracesyms.c (__backtrace_symbols): Likewise. 1.265 ++ * elf/dl-minimal.c (_itoa): Likewise. 1.266 ++ * hurd/hurdmalloc.c (malloc): Likewise. 1.267 ++ (free): Likewise. 1.268 ++ (realloc): Likewise. 1.269 ++ * inet/inet6_option.c (inet6_option_space): Likewise. 1.270 ++ (inet6_option_init): Likewise. 1.271 ++ (inet6_option_append): Likewise. 1.272 ++ (inet6_option_alloc): Likewise. 1.273 ++ (inet6_option_next): Likewise. 1.274 ++ (inet6_option_find): Likewise. 1.275 ++ * io/ftw.c (FTW_NAME): Likewise. 1.276 ++ (NFTW_NAME): Likewise. 1.277 ++ (NFTW_NEW_NAME): Likewise. 1.278 ++ (NFTW_OLD_NAME): Likewise. 1.279 ++ * libio/iofwide.c (_IO_fwide): Likewise. 1.280 ++ * libio/strops.c (_IO_str_init_static_internal): Likewise. 1.281 ++ (_IO_str_init_static): Likewise. 1.282 ++ (_IO_str_init_readonly): Likewise. 1.283 ++ (_IO_str_overflow): Likewise. 1.284 ++ (_IO_str_underflow): Likewise. 1.285 ++ (_IO_str_count): Likewise. 1.286 ++ (_IO_str_seekoff): Likewise. 1.287 ++ (_IO_str_pbackfail): Likewise. 1.288 ++ (_IO_str_finish): Likewise. 1.289 ++ * libio/wstrops.c (_IO_wstr_init_static): Likewise. 1.290 ++ (_IO_wstr_overflow): Likewise. 1.291 ++ (_IO_wstr_underflow): Likewise. 1.292 ++ (_IO_wstr_count): Likewise. 1.293 ++ (_IO_wstr_seekoff): Likewise. 1.294 ++ (_IO_wstr_pbackfail): Likewise. 1.295 ++ (_IO_wstr_finish): Likewise. 1.296 ++ * locale/programs/localedef.c (normalize_codeset): Likewise. 1.297 ++ * locale/programs/locarchive.c (add_locale_to_archive): Likewise. 1.298 ++ (add_locales_to_archive): Likewise. 1.299 ++ (delete_locales_from_archive): Likewise. 1.300 ++ * malloc/malloc.c (__libc_mallinfo): Likewise. 1.301 ++ * math/gen-auto-libm-tests.c (init_fp_formats): Likewise. 1.302 ++ * misc/tsearch.c (__tfind): Likewise. 1.303 ++ * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise. 1.304 ++ * nptl/pthread_attr_getdetachstate.c 1.305 ++ (__pthread_attr_getdetachstate): Likewise. 1.306 ++ * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize): 1.307 ++ Likewise. 1.308 ++ * nptl/pthread_attr_getinheritsched.c 1.309 ++ (__pthread_attr_getinheritsched): Likewise. 1.310 ++ * nptl/pthread_attr_getschedparam.c 1.311 ++ (__pthread_attr_getschedparam): Likewise. 1.312 ++ * nptl/pthread_attr_getschedpolicy.c 1.313 ++ (__pthread_attr_getschedpolicy): Likewise. 1.314 ++ * nptl/pthread_attr_getscope.c (__pthread_attr_getscope): 1.315 ++ Likewise. 1.316 ++ * nptl/pthread_attr_getstack.c (__pthread_attr_getstack): 1.317 ++ Likewise. 1.318 ++ * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr): 1.319 ++ Likewise. 1.320 ++ * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize): 1.321 ++ Likewise. 1.322 ++ * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise. 1.323 ++ (__pthread_attr_init_2_0): Likewise. 1.324 ++ * nptl/pthread_attr_setdetachstate.c 1.325 ++ (__pthread_attr_setdetachstate): Likewise. 1.326 ++ * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize): 1.327 ++ Likewise. 1.328 ++ * nptl/pthread_attr_setinheritsched.c 1.329 ++ (__pthread_attr_setinheritsched): Likewise. 1.330 ++ * nptl/pthread_attr_setschedparam.c 1.331 ++ (__pthread_attr_setschedparam): Likewise. 1.332 ++ * nptl/pthread_attr_setschedpolicy.c 1.333 ++ (__pthread_attr_setschedpolicy): Likewise. 1.334 ++ * nptl/pthread_attr_setscope.c (__pthread_attr_setscope): 1.335 ++ Likewise. 1.336 ++ * nptl/pthread_attr_setstack.c (__pthread_attr_setstack): 1.337 ++ Likewise. 1.338 ++ * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr): 1.339 ++ Likewise. 1.340 ++ * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize): 1.341 ++ Likewise. 1.342 ++ * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock): 1.343 ++ Likewise. 1.344 ++ * nptl/pthread_create.c (__find_in_stack_list): Likewise. 1.345 ++ * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise. 1.346 ++ * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to 1.347 ++ use internal_function. 1.348 ++ * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to 1.349 ++ prototype-style function definition. 1.350 ++ * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. 1.351 ++ (__pthread_mutex_cond_lock_adjust): Likewise. Use 1.352 ++ internal_function. 1.353 ++ * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock): 1.354 ++ Convert to prototype-style function definition. 1.355 ++ * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock): 1.356 ++ Likewise. 1.357 ++ * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): 1.358 ++ Likewise. 1.359 ++ (__pthread_mutex_unlock): Likewise. 1.360 ++ * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise. 1.361 ++ * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise. 1.362 ++ * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise. 1.363 ++ * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise. 1.364 ++ * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise. 1.365 ++ * nss/makedb.c (process_input): Likewise. 1.366 ++ * posix/fnmatch.c (__strchrnul): Likewise. 1.367 ++ (__wcschrnul): Likewise. 1.368 ++ (fnmatch): Likewise. 1.369 ++ * posix/fnmatch_loop.c (FCT): Likewise. 1.370 ++ * posix/glob.c (globfree): Likewise. 1.371 ++ (__glob_pattern_type): Likewise. 1.372 ++ (__glob_pattern_p): Likewise. 1.373 ++ * posix/regcomp.c (re_compile_pattern): Likewise. 1.374 ++ (re_set_syntax): Likewise. 1.375 ++ (re_compile_fastmap): Likewise. 1.376 ++ (regcomp): Likewise. 1.377 ++ (regerror): Likewise. 1.378 ++ (regfree): Likewise. 1.379 ++ * posix/regexec.c (regexec): Likewise. 1.380 ++ (re_match): Likewise. 1.381 ++ (re_search): Likewise. 1.382 ++ (re_match_2): Likewise. 1.383 ++ (re_search_2): Likewise. 1.384 ++ (re_search_stub): Likewise. Use internal_function 1.385 ++ (re_copy_regs): Likewise. 1.386 ++ (re_set_registers): Convert to prototype-style function 1.387 ++ definition. 1.388 ++ (prune_impossible_nodes): Likewise. Use internal_function. 1.389 ++ * resolv/inet_net_pton.c (inet_net_pton): Convert to 1.390 ++ prototype-style function definition. 1.391 ++ (inet_net_pton_ipv4): Likewise. 1.392 ++ * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise. 1.393 ++ * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise. 1.394 ++ * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise. 1.395 ++ * sysdeps/pthread/timer_delete.c (timer_delete): Likewise. 1.396 ++ * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise. 1.397 ++ Make variadic. 1.398 ++ * time/strptime_l.c (localtime_r): Convert to prototype-style 1.399 ++ function definition. 1.400 ++ * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise. 1.401 ++ * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise. 1.402 ++ * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise. 1.403 ++ * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise. 1.404 ++ 1.405 + * crypt/crypt.c (_ufc_doit_r): Convert to prototype-style function 1.406 + definition. 1.407 + (_ufc_doit_r): Likewise. 1.408 +diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c 1.409 +index 1b890bc49a..dad5942dba 100644 1.410 +--- a/crypt/md5-crypt.c 1.411 ++++ b/crypt/md5-crypt.c 1.412 +@@ -89,11 +89,7 @@ extern char *__md5_crypt (const char *key, const char *salt); 1.413 + /* This entry point is equivalent to the `crypt' function in Unix 1.414 + libcs. */ 1.415 + char * 1.416 +-__md5_crypt_r (key, salt, buffer, buflen) 1.417 +- const char *key; 1.418 +- const char *salt; 1.419 +- char *buffer; 1.420 +- int buflen; 1.421 ++__md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen) 1.422 + { 1.423 + unsigned char alt_result[16] 1.424 + __attribute__ ((__aligned__ (__alignof__ (md5_uint32)))); 1.425 +diff --git a/crypt/sha256-crypt.c b/crypt/sha256-crypt.c 1.426 +index d90e291aa7..96102e96c0 100644 1.427 +--- a/crypt/sha256-crypt.c 1.428 ++++ b/crypt/sha256-crypt.c 1.429 +@@ -99,11 +99,7 @@ extern char *__sha256_crypt (const char *key, const char *salt); 1.430 + 1.431 + 1.432 + char * 1.433 +-__sha256_crypt_r (key, salt, buffer, buflen) 1.434 +- const char *key; 1.435 +- const char *salt; 1.436 +- char *buffer; 1.437 +- int buflen; 1.438 ++__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen) 1.439 + { 1.440 + unsigned char alt_result[32] 1.441 + __attribute__ ((__aligned__ (__alignof__ (uint32_t)))); 1.442 +diff --git a/crypt/sha512-crypt.c b/crypt/sha512-crypt.c 1.443 +index 9c581abb00..925749277a 100644 1.444 +--- a/crypt/sha512-crypt.c 1.445 ++++ b/crypt/sha512-crypt.c 1.446 +@@ -99,11 +99,7 @@ extern char *__sha512_crypt (const char *key, const char *salt); 1.447 + 1.448 + 1.449 + char * 1.450 +-__sha512_crypt_r (key, salt, buffer, buflen) 1.451 +- const char *key; 1.452 +- const char *salt; 1.453 +- char *buffer; 1.454 +- int buflen; 1.455 ++__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen) 1.456 + { 1.457 + unsigned char alt_result[64] 1.458 + __attribute__ ((__aligned__ (__alignof__ (uint64_t)))); 1.459 +diff --git a/debug/backtracesyms.c b/debug/backtracesyms.c 1.460 +index 2c7305c81b..c25681b416 100644 1.461 +--- a/debug/backtracesyms.c 1.462 ++++ b/debug/backtracesyms.c 1.463 +@@ -34,9 +34,7 @@ 1.464 + 1.465 + 1.466 + char ** 1.467 +-__backtrace_symbols (array, size) 1.468 +- void *const *array; 1.469 +- int size; 1.470 ++__backtrace_symbols (void *const *array, int size) 1.471 + { 1.472 + Dl_info info[size]; 1.473 + int status[size]; 1.474 +diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c 1.475 +index ec7fe88d30..9129e5b5f6 100644 1.476 +--- a/elf/dl-minimal.c 1.477 ++++ b/elf/dl-minimal.c 1.478 +@@ -324,11 +324,8 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group) 1.479 + also has to be present and it is never about speed when these 1.480 + functions are used. */ 1.481 + char * 1.482 +-_itoa (value, buflim, base, upper_case) 1.483 +- unsigned long long int value; 1.484 +- char *buflim; 1.485 +- unsigned int base; 1.486 +- int upper_case; 1.487 ++_itoa (unsigned long long int value, char *buflim, unsigned int base, 1.488 ++ int upper_case) 1.489 + { 1.490 + assert (! upper_case); 1.491 + 1.492 +diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c 1.493 +index 071abeb718..58c29fa07d 100644 1.494 +--- a/hurd/hurdmalloc.c 1.495 ++++ b/hurd/hurdmalloc.c 1.496 +@@ -202,8 +202,7 @@ more_memory(int size, free_list_t fl) 1.497 + 1.498 + /* Declaration changed to standard one for GNU. */ 1.499 + void * 1.500 +-malloc(size) 1.501 +- size_t size; 1.502 ++malloc (size_t size) 1.503 + { 1.504 + int i, n; 1.505 + free_list_t fl; 1.506 +@@ -269,8 +268,7 @@ malloc(size) 1.507 + 1.508 + /* Declaration changed to standard one for GNU. */ 1.509 + void 1.510 +-free(base) 1.511 +- void *base; 1.512 ++free (void *base) 1.513 + { 1.514 + header_t h; 1.515 + free_list_t fl; 1.516 +@@ -318,9 +316,7 @@ free(base) 1.517 + 1.518 + /* Declaration changed to standard one for GNU. */ 1.519 + void * 1.520 +-realloc(old_base, new_size) 1.521 +- void *old_base; 1.522 +- size_t new_size; 1.523 ++realloc (void *old_base, size_t new_size) 1.524 + { 1.525 + header_t h; 1.526 + free_list_t fl; 1.527 +diff --git a/inet/inet6_option.c b/inet/inet6_option.c 1.528 +index 47ca82ffdc..070be3f9a6 100644 1.529 +--- a/inet/inet6_option.c 1.530 ++++ b/inet/inet6_option.c 1.531 +@@ -88,8 +88,7 @@ static uint8_t *option_alloc (struct cmsghdr *cmsg, int datalen, int multx, 1.532 + beginning (the value y in the alignment term "xn + y"), the type 1.533 + byte, the length byte, and the option data. */ 1.534 + int 1.535 +-inet6_option_space (nbytes) 1.536 +- int nbytes; 1.537 ++inet6_option_space (int nbytes) 1.538 + { 1.539 + /* Add room for the extension header. */ 1.540 + nbytes += sizeof (struct ip6_ext); 1.541 +@@ -106,10 +105,7 @@ link_warning (inet6_option_space, 1.542 + contain either Hop-by-Hop or Destination options. It returns 0 on 1.543 + success or -1 on an error. */ 1.544 + int 1.545 +-inet6_option_init (bp, cmsgp, type) 1.546 +- void *bp; 1.547 +- struct cmsghdr **cmsgp; 1.548 +- int type; 1.549 ++inet6_option_init (void *bp, struct cmsghdr **cmsgp, int type) 1.550 + { 1.551 + /* Only Hop-by-Hop or Destination options allowed. */ 1.552 + if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS) 1.553 +@@ -143,11 +139,8 @@ link_warning (inet6_option_init, 1.554 + inet6_option_init(). This function returns 0 if it succeeds or -1 on 1.555 + an error. */ 1.556 + int 1.557 +-inet6_option_append (cmsg, typep, multx, plusy) 1.558 +- struct cmsghdr *cmsg; 1.559 +- const uint8_t *typep; 1.560 +- int multx; 1.561 +- int plusy; 1.562 ++inet6_option_append (struct cmsghdr *cmsg, const uint8_t *typep, int multx, 1.563 ++ int plusy) 1.564 + { 1.565 + /* typep is a pointer to the 8-bit option type. It is assumed that this 1.566 + field is immediately followed by the 8-bit option data length field, 1.567 +@@ -223,11 +216,7 @@ option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy) 1.568 + 1.569 + 1.570 + uint8_t * 1.571 +-inet6_option_alloc (cmsg, datalen, multx, plusy) 1.572 +- struct cmsghdr *cmsg; 1.573 +- int datalen; 1.574 +- int multx; 1.575 +- int plusy; 1.576 ++inet6_option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy) 1.577 + { 1.578 + return option_alloc (cmsg, datalen, multx, plusy); 1.579 + } 1.580 +@@ -245,9 +234,7 @@ link_warning (inet6_option_alloc, 1.581 + to be processed, the return value is -1 and *tptrp is NULL. If an 1.582 + error occurs, the return value is -1 and *tptrp is not NULL. */ 1.583 + int 1.584 +-inet6_option_next (cmsg, tptrp) 1.585 +- const struct cmsghdr *cmsg; 1.586 +- uint8_t **tptrp; 1.587 ++inet6_option_next (const struct cmsghdr *cmsg, uint8_t **tptrp) 1.588 + { 1.589 + /* Make sure it is an option of the right type. */ 1.590 + if (cmsg->cmsg_level != IPPROTO_IPV6 1.591 +@@ -303,10 +290,7 @@ link_warning (inet6_option_next, 1.592 + pointer to cmsghdr structure of which cmsg_level equals IPPROTO_IPV6 1.593 + and cmsg_type equals either IPV6_HOPOPTS or IPV6_DSTOPTS. */ 1.594 + int 1.595 +-inet6_option_find (cmsg, tptrp, type) 1.596 +- const struct cmsghdr *cmsg; 1.597 +- uint8_t **tptrp; 1.598 +- int type; 1.599 ++inet6_option_find (const struct cmsghdr *cmsg, uint8_t **tptrp, int type) 1.600 + { 1.601 + /* Make sure it is an option of the right type. */ 1.602 + if (cmsg->cmsg_level != IPPROTO_IPV6 1.603 +diff --git a/io/ftw.c b/io/ftw.c 1.604 +index b95da60bb0..beffba4630 100644 1.605 +--- a/io/ftw.c 1.606 ++++ b/io/ftw.c 1.607 +@@ -817,21 +817,14 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors, 1.608 + /* Entry points. */ 1.609 + 1.610 + int 1.611 +-FTW_NAME (path, func, descriptors) 1.612 +- const char *path; 1.613 +- FTW_FUNC_T func; 1.614 +- int descriptors; 1.615 ++FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors) 1.616 + { 1.617 + return ftw_startup (path, 0, func, descriptors, 0); 1.618 + } 1.619 + 1.620 + #ifndef _LIBC 1.621 + int 1.622 +-NFTW_NAME (path, func, descriptors, flags) 1.623 +- const char *path; 1.624 +- NFTW_FUNC_T func; 1.625 +- int descriptors; 1.626 +- int flags; 1.627 ++NFTW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags) 1.628 + { 1.629 + return ftw_startup (path, 1, func, descriptors, flags); 1.630 + } 1.631 +@@ -842,11 +835,7 @@ NFTW_NAME (path, func, descriptors, flags) 1.632 + int NFTW_NEW_NAME (const char *, NFTW_FUNC_T, int, int); 1.633 + 1.634 + int 1.635 +-NFTW_NEW_NAME (path, func, descriptors, flags) 1.636 +- const char *path; 1.637 +- NFTW_FUNC_T func; 1.638 +- int descriptors; 1.639 +- int flags; 1.640 ++NFTW_NEW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags) 1.641 + { 1.642 + if (flags 1.643 + & ~(FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH | FTW_ACTIONRETVAL)) 1.644 +@@ -867,11 +856,7 @@ int NFTW_OLD_NAME (const char *, NFTW_FUNC_T, int, int); 1.645 + 1.646 + int 1.647 + attribute_compat_text_section 1.648 +-NFTW_OLD_NAME (path, func, descriptors, flags) 1.649 +- const char *path; 1.650 +- NFTW_FUNC_T func; 1.651 +- int descriptors; 1.652 +- int flags; 1.653 ++NFTW_OLD_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags) 1.654 + { 1.655 + flags &= (FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH); 1.656 + return ftw_startup (path, 1, func, descriptors, flags); 1.657 +diff --git a/libio/iofwide.c b/libio/iofwide.c 1.658 +index 0c175d19d1..f48ebe1e2f 100644 1.659 +--- a/libio/iofwide.c 1.660 ++++ b/libio/iofwide.c 1.661 +@@ -85,9 +85,7 @@ const struct _IO_codecvt __libio_codecvt = 1.662 + the orientation first. */ 1.663 + #undef _IO_fwide 1.664 + int 1.665 +-_IO_fwide (fp, mode) 1.666 +- _IO_FILE *fp; 1.667 +- int mode; 1.668 ++_IO_fwide (_IO_FILE *fp, int mode) 1.669 + { 1.670 + /* Normalize the value. */ 1.671 + mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1); 1.672 +diff --git a/libio/strops.c b/libio/strops.c 1.673 +index 730dfc4ae1..aa5e700222 100644 1.674 +--- a/libio/strops.c 1.675 ++++ b/libio/strops.c 1.676 +@@ -31,11 +31,8 @@ 1.677 + #include <stdio_ext.h> 1.678 + 1.679 + void 1.680 +-_IO_str_init_static_internal (sf, ptr, size, pstart) 1.681 +- _IO_strfile *sf; 1.682 +- char *ptr; 1.683 +- _IO_size_t size; 1.684 +- char *pstart; 1.685 ++_IO_str_init_static_internal (_IO_strfile *sf, char *ptr, _IO_size_t size, 1.686 ++ char *pstart) 1.687 + { 1.688 + _IO_FILE *fp = &sf->_sbf._f; 1.689 + char *end; 1.690 +@@ -68,29 +65,20 @@ _IO_str_init_static_internal (sf, ptr, size, pstart) 1.691 + } 1.692 + 1.693 + void 1.694 +-_IO_str_init_static (sf, ptr, size, pstart) 1.695 +- _IO_strfile *sf; 1.696 +- char *ptr; 1.697 +- int size; 1.698 +- char *pstart; 1.699 ++_IO_str_init_static (_IO_strfile *sf, char *ptr, int size, char *pstart) 1.700 + { 1.701 + return _IO_str_init_static_internal (sf, ptr, size < 0 ? -1 : size, pstart); 1.702 + } 1.703 + 1.704 + void 1.705 +-_IO_str_init_readonly (sf, ptr, size) 1.706 +- _IO_strfile *sf; 1.707 +- const char *ptr; 1.708 +- int size; 1.709 ++_IO_str_init_readonly (_IO_strfile *sf, const char *ptr, int size) 1.710 + { 1.711 + _IO_str_init_static_internal (sf, (char *) ptr, size < 0 ? -1 : size, NULL); 1.712 + sf->_sbf._f._IO_file_flags |= _IO_NO_WRITES; 1.713 + } 1.714 + 1.715 + int 1.716 +-_IO_str_overflow (fp, c) 1.717 +- _IO_FILE *fp; 1.718 +- int c; 1.719 ++_IO_str_overflow (_IO_FILE *fp, int c) 1.720 + { 1.721 + int flush_only = c == EOF; 1.722 + _IO_size_t pos; 1.723 +@@ -151,8 +139,7 @@ _IO_str_overflow (fp, c) 1.724 + libc_hidden_def (_IO_str_overflow) 1.725 + 1.726 + int 1.727 +-_IO_str_underflow (fp) 1.728 +- _IO_FILE *fp; 1.729 ++_IO_str_underflow (_IO_FILE *fp) 1.730 + { 1.731 + if (fp->_IO_write_ptr > fp->_IO_read_end) 1.732 + fp->_IO_read_end = fp->_IO_write_ptr; 1.733 +@@ -172,8 +159,7 @@ libc_hidden_def (_IO_str_underflow) 1.734 + /* The size of the valid part of the buffer. */ 1.735 + 1.736 + _IO_ssize_t 1.737 +-_IO_str_count (fp) 1.738 +- _IO_FILE *fp; 1.739 ++_IO_str_count (_IO_FILE *fp) 1.740 + { 1.741 + return ((fp->_IO_write_ptr > fp->_IO_read_end 1.742 + ? fp->_IO_write_ptr : fp->_IO_read_end) 1.743 +@@ -246,11 +232,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading) 1.744 + 1.745 + 1.746 + _IO_off64_t 1.747 +-_IO_str_seekoff (fp, offset, dir, mode) 1.748 +- _IO_FILE *fp; 1.749 +- _IO_off64_t offset; 1.750 +- int dir; 1.751 +- int mode; 1.752 ++_IO_str_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) 1.753 + { 1.754 + _IO_off64_t new_pos; 1.755 + 1.756 +@@ -323,9 +305,7 @@ _IO_str_seekoff (fp, offset, dir, mode) 1.757 + libc_hidden_def (_IO_str_seekoff) 1.758 + 1.759 + int 1.760 +-_IO_str_pbackfail (fp, c) 1.761 +- _IO_FILE *fp; 1.762 +- int c; 1.763 ++_IO_str_pbackfail (_IO_FILE *fp, int c) 1.764 + { 1.765 + if ((fp->_flags & _IO_NO_WRITES) && c != EOF) 1.766 + return EOF; 1.767 +@@ -334,9 +314,7 @@ _IO_str_pbackfail (fp, c) 1.768 + libc_hidden_def (_IO_str_pbackfail) 1.769 + 1.770 + void 1.771 +-_IO_str_finish (fp, dummy) 1.772 +- _IO_FILE *fp; 1.773 +- int dummy; 1.774 ++_IO_str_finish (_IO_FILE *fp, int dummy) 1.775 + { 1.776 + if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF)) 1.777 + (((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base); 1.778 +diff --git a/libio/wstrops.c b/libio/wstrops.c 1.779 +index 3993579bd1..eeb9fb20d8 100644 1.780 +--- a/libio/wstrops.c 1.781 ++++ b/libio/wstrops.c 1.782 +@@ -32,11 +32,8 @@ 1.783 + #include <stdio_ext.h> 1.784 + 1.785 + void 1.786 +-_IO_wstr_init_static (fp, ptr, size, pstart) 1.787 +- _IO_FILE *fp; 1.788 +- wchar_t *ptr; 1.789 +- _IO_size_t size; 1.790 +- wchar_t *pstart; 1.791 ++_IO_wstr_init_static (_IO_FILE *fp, wchar_t *ptr, _IO_size_t size, 1.792 ++ wchar_t *pstart) 1.793 + { 1.794 + wchar_t *end; 1.795 + 1.796 +@@ -70,9 +67,7 @@ _IO_wstr_init_static (fp, ptr, size, pstart) 1.797 + } 1.798 + 1.799 + _IO_wint_t 1.800 +-_IO_wstr_overflow (fp, c) 1.801 +- _IO_FILE *fp; 1.802 +- _IO_wint_t c; 1.803 ++_IO_wstr_overflow (_IO_FILE *fp, _IO_wint_t c) 1.804 + { 1.805 + int flush_only = c == WEOF; 1.806 + _IO_size_t pos; 1.807 +@@ -142,8 +137,7 @@ _IO_wstr_overflow (fp, c) 1.808 + 1.809 + 1.810 + _IO_wint_t 1.811 +-_IO_wstr_underflow (fp) 1.812 +- _IO_FILE *fp; 1.813 ++_IO_wstr_underflow (_IO_FILE *fp) 1.814 + { 1.815 + if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end) 1.816 + fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr; 1.817 +@@ -162,8 +156,7 @@ _IO_wstr_underflow (fp) 1.818 + 1.819 + /* The size of the valid part of the buffer. */ 1.820 + _IO_ssize_t 1.821 +-_IO_wstr_count (fp) 1.822 +- _IO_FILE *fp; 1.823 ++_IO_wstr_count (_IO_FILE *fp) 1.824 + { 1.825 + struct _IO_wide_data *wd = fp->_wide_data; 1.826 + 1.827 +@@ -244,11 +237,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading) 1.828 + 1.829 + 1.830 + _IO_off64_t 1.831 +-_IO_wstr_seekoff (fp, offset, dir, mode) 1.832 +- _IO_FILE *fp; 1.833 +- _IO_off64_t offset; 1.834 +- int dir; 1.835 +- int mode; 1.836 ++_IO_wstr_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode) 1.837 + { 1.838 + _IO_off64_t new_pos; 1.839 + 1.840 +@@ -326,9 +315,7 @@ _IO_wstr_seekoff (fp, offset, dir, mode) 1.841 + } 1.842 + 1.843 + _IO_wint_t 1.844 +-_IO_wstr_pbackfail (fp, c) 1.845 +- _IO_FILE *fp; 1.846 +- _IO_wint_t c; 1.847 ++_IO_wstr_pbackfail (_IO_FILE *fp, _IO_wint_t c) 1.848 + { 1.849 + if ((fp->_flags & _IO_NO_WRITES) && c != WEOF) 1.850 + return WEOF; 1.851 +@@ -336,9 +323,7 @@ _IO_wstr_pbackfail (fp, c) 1.852 + } 1.853 + 1.854 + void 1.855 +-_IO_wstr_finish (fp, dummy) 1.856 +- _IO_FILE *fp; 1.857 +- int dummy; 1.858 ++_IO_wstr_finish (_IO_FILE *fp, int dummy) 1.859 + { 1.860 + if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF)) 1.861 + (((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base); 1.862 +diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c 1.863 +index 06fca12094..c8da20b813 100644 1.864 +--- a/locale/programs/localedef.c 1.865 ++++ b/locale/programs/localedef.c 1.866 +@@ -504,9 +504,7 @@ construct_output_path (char *path) 1.867 + names. Normalization allows the user to use any of the common 1.868 + names. */ 1.869 + static const char * 1.870 +-normalize_codeset (codeset, name_len) 1.871 +- const char *codeset; 1.872 +- size_t name_len; 1.873 ++normalize_codeset (const char *codeset, size_t name_len) 1.874 + { 1.875 + int len = 0; 1.876 + int only_digit = 1; 1.877 +diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c 1.878 +index 49f7f1b3cf..345f9b70e2 100644 1.879 +--- a/locale/programs/locarchive.c 1.880 ++++ b/locale/programs/locarchive.c 1.881 +@@ -1127,11 +1127,8 @@ add_locale (struct locarhandle *ah, 1.882 + of the files if necessary. Add all the names, possibly overwriting 1.883 + old files. */ 1.884 + int 1.885 +-add_locale_to_archive (ah, name, data, replace) 1.886 +- struct locarhandle *ah; 1.887 +- const char *name; 1.888 +- locale_data_t data; 1.889 +- bool replace; 1.890 ++add_locale_to_archive (struct locarhandle *ah, const char *name, 1.891 ++ locale_data_t data, bool replace) 1.892 + { 1.893 + char *normalized_name = NULL; 1.894 + uint32_t locrec_offset; 1.895 +@@ -1329,10 +1326,7 @@ add_locale_to_archive (ah, name, data, replace) 1.896 + 1.897 + 1.898 + int 1.899 +-add_locales_to_archive (nlist, list, replace) 1.900 +- size_t nlist; 1.901 +- char *list[]; 1.902 +- bool replace; 1.903 ++add_locales_to_archive (size_t nlist, char *list[], bool replace) 1.904 + { 1.905 + struct locarhandle ah; 1.906 + int result = 0; 1.907 +@@ -1529,9 +1523,7 @@ add_locales_to_archive (nlist, list, replace) 1.908 + 1.909 + 1.910 + int 1.911 +-delete_locales_from_archive (nlist, list) 1.912 +- size_t nlist; 1.913 +- char *list[]; 1.914 ++delete_locales_from_archive (size_t nlist, char *list[]) 1.915 + { 1.916 + struct locarhandle ah; 1.917 + struct locarhead *head; 1.918 +diff --git a/malloc/malloc.c b/malloc/malloc.c 1.919 +index 0eca9ce0e2..9371b5a224 100644 1.920 +--- a/malloc/malloc.c 1.921 ++++ b/malloc/malloc.c 1.922 +@@ -4667,7 +4667,7 @@ int_mallinfo (mstate av, struct mallinfo *m) 1.923 + 1.924 + 1.925 + struct mallinfo 1.926 +-__libc_mallinfo () 1.927 ++__libc_mallinfo (void) 1.928 + { 1.929 + struct mallinfo m; 1.930 + mstate ar_ptr; 1.931 +diff --git a/math/gen-auto-libm-tests.c b/math/gen-auto-libm-tests.c 1.932 +index 465f7c602c..03ec6c4987 100644 1.933 +--- a/math/gen-auto-libm-tests.c 1.934 ++++ b/math/gen-auto-libm-tests.c 1.935 +@@ -675,7 +675,7 @@ generic_value_copy (generic_value *dest, const generic_value *src) 1.936 + /* Initialize data for floating-point formats. */ 1.937 + 1.938 + static void 1.939 +-init_fp_formats () 1.940 ++init_fp_formats (void) 1.941 + { 1.942 + int global_max_exp = 0, global_min_subnorm_exp = 0; 1.943 + for (fp_format f = fp_first_format; f < fp_num_formats; f++) 1.944 +diff --git a/misc/tsearch.c b/misc/tsearch.c 1.945 +index 869dc9bec7..5b9276c9f2 100644 1.946 +--- a/misc/tsearch.c 1.947 ++++ b/misc/tsearch.c 1.948 +@@ -301,10 +301,7 @@ weak_alias (__tsearch, tsearch) 1.949 + KEY is the key to be located, ROOTP is the address of tree root, 1.950 + COMPAR the ordering function. */ 1.951 + void * 1.952 +-__tfind (key, vrootp, compar) 1.953 +- const void *key; 1.954 +- void *const *vrootp; 1.955 +- __compar_fn_t compar; 1.956 ++__tfind (const void *key, void *const *vrootp, __compar_fn_t compar) 1.957 + { 1.958 + node *rootp = (node *) vrootp; 1.959 + 1.960 +diff --git a/nptl/pthread_attr_destroy.c b/nptl/pthread_attr_destroy.c 1.961 +index 72ee19eca9..f2701c8bb3 100644 1.962 +--- a/nptl/pthread_attr_destroy.c 1.963 ++++ b/nptl/pthread_attr_destroy.c 1.964 +@@ -24,8 +24,7 @@ 1.965 + #include <shlib-compat.h> 1.966 + 1.967 + int 1.968 +-__pthread_attr_destroy (attr) 1.969 +- pthread_attr_t *attr; 1.970 ++__pthread_attr_destroy (pthread_attr_t *attr) 1.971 + { 1.972 + struct pthread_attr *iattr; 1.973 + 1.974 +diff --git a/nptl/pthread_attr_getdetachstate.c b/nptl/pthread_attr_getdetachstate.c 1.975 +index 92d683dc5c..8cc78785de 100644 1.976 +--- a/nptl/pthread_attr_getdetachstate.c 1.977 ++++ b/nptl/pthread_attr_getdetachstate.c 1.978 +@@ -21,9 +21,7 @@ 1.979 + 1.980 + 1.981 + int 1.982 +-__pthread_attr_getdetachstate (attr, detachstate) 1.983 +- const pthread_attr_t *attr; 1.984 +- int *detachstate; 1.985 ++__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate) 1.986 + { 1.987 + struct pthread_attr *iattr; 1.988 + 1.989 +diff --git a/nptl/pthread_attr_getguardsize.c b/nptl/pthread_attr_getguardsize.c 1.990 +index 83cb8016ea..b05b36ecfb 100644 1.991 +--- a/nptl/pthread_attr_getguardsize.c 1.992 ++++ b/nptl/pthread_attr_getguardsize.c 1.993 +@@ -21,9 +21,7 @@ 1.994 + 1.995 + 1.996 + int 1.997 +-pthread_attr_getguardsize (attr, guardsize) 1.998 +- const pthread_attr_t *attr; 1.999 +- size_t *guardsize; 1.1000 ++pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize) 1.1001 + { 1.1002 + struct pthread_attr *iattr; 1.1003 + 1.1004 +diff --git a/nptl/pthread_attr_getinheritsched.c b/nptl/pthread_attr_getinheritsched.c 1.1005 +index 9a0e8e6b8f..ed3435e020 100644 1.1006 +--- a/nptl/pthread_attr_getinheritsched.c 1.1007 ++++ b/nptl/pthread_attr_getinheritsched.c 1.1008 +@@ -21,9 +21,7 @@ 1.1009 + 1.1010 + 1.1011 + int 1.1012 +-__pthread_attr_getinheritsched (attr, inherit) 1.1013 +- const pthread_attr_t *attr; 1.1014 +- int *inherit; 1.1015 ++__pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inherit) 1.1016 + { 1.1017 + struct pthread_attr *iattr; 1.1018 + 1.1019 +diff --git a/nptl/pthread_attr_getschedparam.c b/nptl/pthread_attr_getschedparam.c 1.1020 +index 3f38bd711d..3c9dffa6d3 100644 1.1021 +--- a/nptl/pthread_attr_getschedparam.c 1.1022 ++++ b/nptl/pthread_attr_getschedparam.c 1.1023 +@@ -22,9 +22,8 @@ 1.1024 + 1.1025 + 1.1026 + int 1.1027 +-__pthread_attr_getschedparam (attr, param) 1.1028 +- const pthread_attr_t *attr; 1.1029 +- struct sched_param *param; 1.1030 ++__pthread_attr_getschedparam (const pthread_attr_t *attr, 1.1031 ++ struct sched_param *param) 1.1032 + { 1.1033 + struct pthread_attr *iattr; 1.1034 + 1.1035 +diff --git a/nptl/pthread_attr_getschedpolicy.c b/nptl/pthread_attr_getschedpolicy.c 1.1036 +index 19996a68de..10728c364d 100644 1.1037 +--- a/nptl/pthread_attr_getschedpolicy.c 1.1038 ++++ b/nptl/pthread_attr_getschedpolicy.c 1.1039 +@@ -21,9 +21,7 @@ 1.1040 + 1.1041 + 1.1042 + int 1.1043 +-__pthread_attr_getschedpolicy (attr, policy) 1.1044 +- const pthread_attr_t *attr; 1.1045 +- int *policy; 1.1046 ++__pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy) 1.1047 + { 1.1048 + struct pthread_attr *iattr; 1.1049 + 1.1050 +diff --git a/nptl/pthread_attr_getscope.c b/nptl/pthread_attr_getscope.c 1.1051 +index e72247a99a..e704161caf 100644 1.1052 +--- a/nptl/pthread_attr_getscope.c 1.1053 ++++ b/nptl/pthread_attr_getscope.c 1.1054 +@@ -21,9 +21,7 @@ 1.1055 + 1.1056 + 1.1057 + int 1.1058 +-__pthread_attr_getscope (attr, scope) 1.1059 +- const pthread_attr_t *attr; 1.1060 +- int *scope; 1.1061 ++__pthread_attr_getscope (const pthread_attr_t *attr, int *scope) 1.1062 + { 1.1063 + struct pthread_attr *iattr; 1.1064 + 1.1065 +diff --git a/nptl/pthread_attr_getstack.c b/nptl/pthread_attr_getstack.c 1.1066 +index 96c15c58ad..4cedcc5fd2 100644 1.1067 +--- a/nptl/pthread_attr_getstack.c 1.1068 ++++ b/nptl/pthread_attr_getstack.c 1.1069 +@@ -21,10 +21,8 @@ 1.1070 + 1.1071 + 1.1072 + int 1.1073 +-__pthread_attr_getstack (attr, stackaddr, stacksize) 1.1074 +- const pthread_attr_t *attr; 1.1075 +- void **stackaddr; 1.1076 +- size_t *stacksize; 1.1077 ++__pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr, 1.1078 ++ size_t *stacksize) 1.1079 + { 1.1080 + struct pthread_attr *iattr; 1.1081 + 1.1082 +diff --git a/nptl/pthread_attr_getstackaddr.c b/nptl/pthread_attr_getstackaddr.c 1.1083 +index 9c85cec202..bceab68b58 100644 1.1084 +--- a/nptl/pthread_attr_getstackaddr.c 1.1085 ++++ b/nptl/pthread_attr_getstackaddr.c 1.1086 +@@ -22,9 +22,7 @@ 1.1087 + 1.1088 + 1.1089 + int 1.1090 +-__pthread_attr_getstackaddr (attr, stackaddr) 1.1091 +- const pthread_attr_t *attr; 1.1092 +- void **stackaddr; 1.1093 ++__pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr) 1.1094 + { 1.1095 + struct pthread_attr *iattr; 1.1096 + 1.1097 +diff --git a/nptl/pthread_attr_getstacksize.c b/nptl/pthread_attr_getstacksize.c 1.1098 +index ab18c27ae0..b48e1d06af 100644 1.1099 +--- a/nptl/pthread_attr_getstacksize.c 1.1100 ++++ b/nptl/pthread_attr_getstacksize.c 1.1101 +@@ -21,9 +21,7 @@ 1.1102 + 1.1103 + 1.1104 + int 1.1105 +-__pthread_attr_getstacksize (attr, stacksize) 1.1106 +- const pthread_attr_t *attr; 1.1107 +- size_t *stacksize; 1.1108 ++__pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *stacksize) 1.1109 + { 1.1110 + struct pthread_attr *iattr; 1.1111 + 1.1112 +diff --git a/nptl/pthread_attr_init.c b/nptl/pthread_attr_init.c 1.1113 +index 89bec2959b..3780b625c3 100644 1.1114 +--- a/nptl/pthread_attr_init.c 1.1115 ++++ b/nptl/pthread_attr_init.c 1.1116 +@@ -30,8 +30,7 @@ int __attr_list_lock = LLL_LOCK_INITIALIZER; 1.1117 + 1.1118 + 1.1119 + int 1.1120 +-__pthread_attr_init_2_1 (attr) 1.1121 +- pthread_attr_t *attr; 1.1122 ++__pthread_attr_init_2_1 (pthread_attr_t *attr) 1.1123 + { 1.1124 + struct pthread_attr *iattr; 1.1125 + 1.1126 +@@ -54,8 +53,7 @@ versioned_symbol (libpthread, __pthread_attr_init_2_1, pthread_attr_init, 1.1127 + 1.1128 + #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) 1.1129 + int 1.1130 +-__pthread_attr_init_2_0 (attr) 1.1131 +- pthread_attr_t *attr; 1.1132 ++__pthread_attr_init_2_0 (pthread_attr_t *attr) 1.1133 + { 1.1134 + /* This code is specific to the old LinuxThread code which has a too 1.1135 + small pthread_attr_t definition. The struct looked like 1.1136 +diff --git a/nptl/pthread_attr_setdetachstate.c b/nptl/pthread_attr_setdetachstate.c 1.1137 +index ad0d43135a..c4e085b723 100644 1.1138 +--- a/nptl/pthread_attr_setdetachstate.c 1.1139 ++++ b/nptl/pthread_attr_setdetachstate.c 1.1140 +@@ -22,9 +22,7 @@ 1.1141 + 1.1142 + 1.1143 + int 1.1144 +-__pthread_attr_setdetachstate (attr, detachstate) 1.1145 +- pthread_attr_t *attr; 1.1146 +- int detachstate; 1.1147 ++__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate) 1.1148 + { 1.1149 + struct pthread_attr *iattr; 1.1150 + 1.1151 +diff --git a/nptl/pthread_attr_setguardsize.c b/nptl/pthread_attr_setguardsize.c 1.1152 +index 86df9715d8..9a7a984bd9 100644 1.1153 +--- a/nptl/pthread_attr_setguardsize.c 1.1154 ++++ b/nptl/pthread_attr_setguardsize.c 1.1155 +@@ -21,9 +21,7 @@ 1.1156 + 1.1157 + 1.1158 + int 1.1159 +-pthread_attr_setguardsize (attr, guardsize) 1.1160 +- pthread_attr_t *attr; 1.1161 +- size_t guardsize; 1.1162 ++pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize) 1.1163 + { 1.1164 + struct pthread_attr *iattr; 1.1165 + 1.1166 +diff --git a/nptl/pthread_attr_setinheritsched.c b/nptl/pthread_attr_setinheritsched.c 1.1167 +index 477072d8de..c66a4e3d38 100644 1.1168 +--- a/nptl/pthread_attr_setinheritsched.c 1.1169 ++++ b/nptl/pthread_attr_setinheritsched.c 1.1170 +@@ -22,9 +22,7 @@ 1.1171 + 1.1172 + 1.1173 + int 1.1174 +-__pthread_attr_setinheritsched (attr, inherit) 1.1175 +- pthread_attr_t *attr; 1.1176 +- int inherit; 1.1177 ++__pthread_attr_setinheritsched (pthread_attr_t *attr, int inherit) 1.1178 + { 1.1179 + struct pthread_attr *iattr; 1.1180 + 1.1181 +diff --git a/nptl/pthread_attr_setschedparam.c b/nptl/pthread_attr_setschedparam.c 1.1182 +index f6347a78c8..d6ac0fffb2 100644 1.1183 +--- a/nptl/pthread_attr_setschedparam.c 1.1184 ++++ b/nptl/pthread_attr_setschedparam.c 1.1185 +@@ -23,9 +23,8 @@ 1.1186 + 1.1187 + 1.1188 + int 1.1189 +-__pthread_attr_setschedparam (attr, param) 1.1190 +- pthread_attr_t *attr; 1.1191 +- const struct sched_param *param; 1.1192 ++__pthread_attr_setschedparam (pthread_attr_t *attr, 1.1193 ++ const struct sched_param *param) 1.1194 + { 1.1195 + assert (sizeof (*attr) >= sizeof (struct pthread_attr)); 1.1196 + struct pthread_attr *iattr = (struct pthread_attr *) attr; 1.1197 +diff --git a/nptl/pthread_attr_setschedpolicy.c b/nptl/pthread_attr_setschedpolicy.c 1.1198 +index 70f439590f..8bc9ed20fb 100644 1.1199 +--- a/nptl/pthread_attr_setschedpolicy.c 1.1200 ++++ b/nptl/pthread_attr_setschedpolicy.c 1.1201 +@@ -22,9 +22,7 @@ 1.1202 + 1.1203 + 1.1204 + int 1.1205 +-__pthread_attr_setschedpolicy (attr, policy) 1.1206 +- pthread_attr_t *attr; 1.1207 +- int policy; 1.1208 ++__pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy) 1.1209 + { 1.1210 + struct pthread_attr *iattr; 1.1211 + 1.1212 +diff --git a/nptl/pthread_attr_setscope.c b/nptl/pthread_attr_setscope.c 1.1213 +index 8f510bfec2..7559d105db 100644 1.1214 +--- a/nptl/pthread_attr_setscope.c 1.1215 ++++ b/nptl/pthread_attr_setscope.c 1.1216 +@@ -22,9 +22,7 @@ 1.1217 + 1.1218 + 1.1219 + int 1.1220 +-__pthread_attr_setscope (attr, scope) 1.1221 +- pthread_attr_t *attr; 1.1222 +- int scope; 1.1223 ++__pthread_attr_setscope (pthread_attr_t *attr, int scope) 1.1224 + { 1.1225 + struct pthread_attr *iattr; 1.1226 + 1.1227 +diff --git a/nptl/pthread_attr_setstack.c b/nptl/pthread_attr_setstack.c 1.1228 +index 6898f72540..c44c383aa7 100644 1.1229 +--- a/nptl/pthread_attr_setstack.c 1.1230 ++++ b/nptl/pthread_attr_setstack.c 1.1231 +@@ -28,10 +28,8 @@ 1.1232 + 1.1233 + 1.1234 + int 1.1235 +-__pthread_attr_setstack (attr, stackaddr, stacksize) 1.1236 +- pthread_attr_t *attr; 1.1237 +- void *stackaddr; 1.1238 +- size_t stacksize; 1.1239 ++__pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, 1.1240 ++ size_t stacksize) 1.1241 + { 1.1242 + struct pthread_attr *iattr; 1.1243 + 1.1244 +diff --git a/nptl/pthread_attr_setstackaddr.c b/nptl/pthread_attr_setstackaddr.c 1.1245 +index 2c028a54fa..ab0d7d2a33 100644 1.1246 +--- a/nptl/pthread_attr_setstackaddr.c 1.1247 ++++ b/nptl/pthread_attr_setstackaddr.c 1.1248 +@@ -22,9 +22,7 @@ 1.1249 + 1.1250 + 1.1251 + int 1.1252 +-__pthread_attr_setstackaddr (attr, stackaddr) 1.1253 +- pthread_attr_t *attr; 1.1254 +- void *stackaddr; 1.1255 ++__pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr) 1.1256 + { 1.1257 + struct pthread_attr *iattr; 1.1258 + 1.1259 +diff --git a/nptl/pthread_attr_setstacksize.c b/nptl/pthread_attr_setstacksize.c 1.1260 +index a0cda0cbce..d3d109a232 100644 1.1261 +--- a/nptl/pthread_attr_setstacksize.c 1.1262 ++++ b/nptl/pthread_attr_setstacksize.c 1.1263 +@@ -27,9 +27,7 @@ 1.1264 + 1.1265 + 1.1266 + int 1.1267 +-__pthread_attr_setstacksize (attr, stacksize) 1.1268 +- pthread_attr_t *attr; 1.1269 +- size_t stacksize; 1.1270 ++__pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize) 1.1271 + { 1.1272 + struct pthread_attr *iattr; 1.1273 + 1.1274 +diff --git a/nptl/pthread_condattr_setclock.c b/nptl/pthread_condattr_setclock.c 1.1275 +index 0748d78d05..5300844d06 100644 1.1276 +--- a/nptl/pthread_condattr_setclock.c 1.1277 ++++ b/nptl/pthread_condattr_setclock.c 1.1278 +@@ -25,9 +25,7 @@ 1.1279 + 1.1280 + 1.1281 + int 1.1282 +-pthread_condattr_setclock (attr, clock_id) 1.1283 +- pthread_condattr_t *attr; 1.1284 +- clockid_t clock_id; 1.1285 ++pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id) 1.1286 + { 1.1287 + /* Only a few clocks are allowed. */ 1.1288 + if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME) 1.1289 +diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c 1.1290 +index d10f4ea800..790f46db3f 100644 1.1291 +--- a/nptl/pthread_create.c 1.1292 ++++ b/nptl/pthread_create.c 1.1293 +@@ -80,8 +80,7 @@ static int create_thread (struct pthread *pd, const struct pthread_attr *attr, 1.1294 + 1.1295 + struct pthread * 1.1296 + internal_function 1.1297 +-__find_in_stack_list (pd) 1.1298 +- struct pthread *pd; 1.1299 ++__find_in_stack_list (struct pthread *pd) 1.1300 + { 1.1301 + list_t *entry; 1.1302 + struct pthread *result = NULL; 1.1303 +diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c 1.1304 +index 52a4602730..5ebff5cbbc 100644 1.1305 +--- a/nptl/pthread_getattr_np.c 1.1306 ++++ b/nptl/pthread_getattr_np.c 1.1307 +@@ -30,9 +30,7 @@ 1.1308 + 1.1309 + 1.1310 + int 1.1311 +-pthread_getattr_np (thread_id, attr) 1.1312 +- pthread_t thread_id; 1.1313 +- pthread_attr_t *attr; 1.1314 ++pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr) 1.1315 + { 1.1316 + struct pthread *thread = (struct pthread *) thread_id; 1.1317 + struct pthread_attr *iattr = (struct pthread_attr *) attr; 1.1318 +diff --git a/nptl/pthread_mutex_cond_lock.c b/nptl/pthread_mutex_cond_lock.c 1.1319 +index 7b6fbc18aa..2ac421fd63 100644 1.1320 +--- a/nptl/pthread_mutex_cond_lock.c 1.1321 ++++ b/nptl/pthread_mutex_cond_lock.c 1.1322 +@@ -14,7 +14,7 @@ 1.1323 + #define LLL_ROBUST_MUTEX_LOCK(mutex, id) \ 1.1324 + lll_robust_cond_lock ((mutex)->__data.__lock, id, \ 1.1325 + PTHREAD_ROBUST_MUTEX_PSHARED (mutex)) 1.1326 +-#define __pthread_mutex_lock __pthread_mutex_cond_lock 1.1327 ++#define __pthread_mutex_lock internal_function __pthread_mutex_cond_lock 1.1328 + #define __pthread_mutex_lock_full __pthread_mutex_cond_lock_full 1.1329 + #define NO_INCR 1.1330 + 1.1331 +diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c 1.1332 +index d71cfef0f7..45c159bad3 100644 1.1333 +--- a/nptl/pthread_mutex_init.c 1.1334 ++++ b/nptl/pthread_mutex_init.c 1.1335 +@@ -55,9 +55,8 @@ prio_inherit_missing (void) 1.1336 + } 1.1337 + 1.1338 + int 1.1339 +-__pthread_mutex_init (mutex, mutexattr) 1.1340 +- pthread_mutex_t *mutex; 1.1341 +- const pthread_mutexattr_t *mutexattr; 1.1342 ++__pthread_mutex_init (pthread_mutex_t *mutex, 1.1343 ++ const pthread_mutexattr_t *mutexattr) 1.1344 + { 1.1345 + const struct pthread_mutexattr *imutexattr; 1.1346 + 1.1347 +diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c 1.1348 +index 9a3b46624d..493fe43778 100644 1.1349 +--- a/nptl/pthread_mutex_lock.c 1.1350 ++++ b/nptl/pthread_mutex_lock.c 1.1351 +@@ -60,8 +60,7 @@ static int __pthread_mutex_lock_full (pthread_mutex_t *mutex) 1.1352 + __attribute_noinline__; 1.1353 + 1.1354 + int 1.1355 +-__pthread_mutex_lock (mutex) 1.1356 +- pthread_mutex_t *mutex; 1.1357 ++__pthread_mutex_lock (pthread_mutex_t *mutex) 1.1358 + { 1.1359 + assert (sizeof (mutex->__size) >= sizeof (mutex->__data)); 1.1360 + 1.1361 +@@ -521,8 +520,8 @@ hidden_def (__pthread_mutex_lock) 1.1362 + 1.1363 + #ifdef NO_INCR 1.1364 + void 1.1365 +-__pthread_mutex_cond_lock_adjust (mutex) 1.1366 +- pthread_mutex_t *mutex; 1.1367 ++internal_function 1.1368 ++__pthread_mutex_cond_lock_adjust (pthread_mutex_t *mutex) 1.1369 + { 1.1370 + assert ((mutex->__data.__kind & PTHREAD_MUTEX_PRIO_INHERIT_NP) != 0); 1.1371 + assert ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0); 1.1372 +diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c 1.1373 +index f0fb03e90b..370a232773 100644 1.1374 +--- a/nptl/pthread_mutex_timedlock.c 1.1375 ++++ b/nptl/pthread_mutex_timedlock.c 1.1376 +@@ -41,9 +41,8 @@ 1.1377 + #endif 1.1378 + 1.1379 + int 1.1380 +-pthread_mutex_timedlock (mutex, abstime) 1.1381 +- pthread_mutex_t *mutex; 1.1382 +- const struct timespec *abstime; 1.1383 ++pthread_mutex_timedlock (pthread_mutex_t *mutex, 1.1384 ++ const struct timespec *abstime) 1.1385 + { 1.1386 + int oldval; 1.1387 + pid_t id = THREAD_GETMEM (THREAD_SELF, tid); 1.1388 +diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c 1.1389 +index 33df384bd0..17ec2302ec 100644 1.1390 +--- a/nptl/pthread_mutex_trylock.c 1.1391 ++++ b/nptl/pthread_mutex_trylock.c 1.1392 +@@ -31,8 +31,7 @@ 1.1393 + #endif 1.1394 + 1.1395 + int 1.1396 +-__pthread_mutex_trylock (mutex) 1.1397 +- pthread_mutex_t *mutex; 1.1398 ++__pthread_mutex_trylock (pthread_mutex_t *mutex) 1.1399 + { 1.1400 + int oldval; 1.1401 + pid_t id = THREAD_GETMEM (THREAD_SELF, tid); 1.1402 +diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c 1.1403 +index 9e864c1832..c078f7ebe3 100644 1.1404 +--- a/nptl/pthread_mutex_unlock.c 1.1405 ++++ b/nptl/pthread_mutex_unlock.c 1.1406 +@@ -34,9 +34,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) 1.1407 + 1.1408 + int 1.1409 + internal_function attribute_hidden 1.1410 +-__pthread_mutex_unlock_usercnt (mutex, decr) 1.1411 +- pthread_mutex_t *mutex; 1.1412 +- int decr; 1.1413 ++__pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr) 1.1414 + { 1.1415 + int type = PTHREAD_MUTEX_TYPE_ELISION (mutex); 1.1416 + if (__builtin_expect (type & 1.1417 +@@ -309,8 +307,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr) 1.1418 + 1.1419 + 1.1420 + int 1.1421 +-__pthread_mutex_unlock (mutex) 1.1422 +- pthread_mutex_t *mutex; 1.1423 ++__pthread_mutex_unlock (pthread_mutex_t *mutex) 1.1424 + { 1.1425 + return __pthread_mutex_unlock_usercnt (mutex, 1); 1.1426 + } 1.1427 +diff --git a/nptl_db/td_ta_clear_event.c b/nptl_db/td_ta_clear_event.c 1.1428 +index 368c21eca8..9279837dd9 100644 1.1429 +--- a/nptl_db/td_ta_clear_event.c 1.1430 ++++ b/nptl_db/td_ta_clear_event.c 1.1431 +@@ -22,9 +22,7 @@ 1.1432 + 1.1433 + 1.1434 + td_err_e 1.1435 +-td_ta_clear_event (ta_arg, event) 1.1436 +- const td_thragent_t *ta_arg; 1.1437 +- td_thr_events_t *event; 1.1438 ++td_ta_clear_event (const td_thragent_t *ta_arg, td_thr_events_t *event) 1.1439 + { 1.1440 + td_thragent_t *const ta = (td_thragent_t *) ta_arg; 1.1441 + td_err_e err; 1.1442 +diff --git a/nptl_db/td_ta_set_event.c b/nptl_db/td_ta_set_event.c 1.1443 +index 132363d831..157e022b83 100644 1.1444 +--- a/nptl_db/td_ta_set_event.c 1.1445 ++++ b/nptl_db/td_ta_set_event.c 1.1446 +@@ -22,9 +22,7 @@ 1.1447 + 1.1448 + 1.1449 + td_err_e 1.1450 +-td_ta_set_event (ta_arg, event) 1.1451 +- const td_thragent_t *ta_arg; 1.1452 +- td_thr_events_t *event; 1.1453 ++td_ta_set_event (const td_thragent_t *ta_arg, td_thr_events_t *event) 1.1454 + { 1.1455 + td_thragent_t *const ta = (td_thragent_t *) ta_arg; 1.1456 + td_err_e err; 1.1457 +diff --git a/nptl_db/td_thr_clear_event.c b/nptl_db/td_thr_clear_event.c 1.1458 +index 4f81ede8ed..1cd732d4f1 100644 1.1459 +--- a/nptl_db/td_thr_clear_event.c 1.1460 ++++ b/nptl_db/td_thr_clear_event.c 1.1461 +@@ -24,9 +24,7 @@ 1.1462 + 1.1463 + 1.1464 + td_err_e 1.1465 +-td_thr_clear_event (th, event) 1.1466 +- const td_thrhandle_t *th; 1.1467 +- td_thr_events_t *event; 1.1468 ++td_thr_clear_event (const td_thrhandle_t *th, td_thr_events_t *event) 1.1469 + { 1.1470 + td_err_e err; 1.1471 + psaddr_t eventmask; 1.1472 +diff --git a/nptl_db/td_thr_event_enable.c b/nptl_db/td_thr_event_enable.c 1.1473 +index dba7b3886b..3ee9e1dabe 100644 1.1474 +--- a/nptl_db/td_thr_event_enable.c 1.1475 ++++ b/nptl_db/td_thr_event_enable.c 1.1476 +@@ -21,9 +21,7 @@ 1.1477 + 1.1478 + 1.1479 + td_err_e 1.1480 +-td_thr_event_enable (th, onoff) 1.1481 +- const td_thrhandle_t *th; 1.1482 +- int onoff; 1.1483 ++td_thr_event_enable (const td_thrhandle_t *th, int onoff) 1.1484 + { 1.1485 + LOG ("td_thr_event_enable"); 1.1486 + 1.1487 +diff --git a/nptl_db/td_thr_set_event.c b/nptl_db/td_thr_set_event.c 1.1488 +index bf5f6b7450..64ef046727 100644 1.1489 +--- a/nptl_db/td_thr_set_event.c 1.1490 ++++ b/nptl_db/td_thr_set_event.c 1.1491 +@@ -24,9 +24,7 @@ 1.1492 + 1.1493 + 1.1494 + td_err_e 1.1495 +-td_thr_set_event (th, event) 1.1496 +- const td_thrhandle_t *th; 1.1497 +- td_thr_events_t *event; 1.1498 ++td_thr_set_event (const td_thrhandle_t *th, td_thr_events_t *event) 1.1499 + { 1.1500 + td_err_e err; 1.1501 + psaddr_t eventmask; 1.1502 +diff --git a/nss/makedb.c b/nss/makedb.c 1.1503 +index c7b466ab43..e53a3ca6ba 100644 1.1504 +--- a/nss/makedb.c 1.1505 ++++ b/nss/makedb.c 1.1506 +@@ -415,11 +415,7 @@ valstr_compare (const void *p1, const void *p2) 1.1507 + 1.1508 + 1.1509 + static int 1.1510 +-process_input (input, inname, to_lowercase, be_quiet) 1.1511 +- FILE *input; 1.1512 +- const char *inname; 1.1513 +- int to_lowercase; 1.1514 +- int be_quiet; 1.1515 ++process_input (FILE *input, const char *inname, int to_lowercase, int be_quiet) 1.1516 + { 1.1517 + char *line; 1.1518 + size_t linelen; 1.1519 +diff --git a/posix/fnmatch.c b/posix/fnmatch.c 1.1520 +index fd85efa2c7..16d3555a43 100644 1.1521 +--- a/posix/fnmatch.c 1.1522 ++++ b/posix/fnmatch.c 1.1523 +@@ -166,9 +166,7 @@ static int posixly_correct; 1.1524 + 1.1525 + # if !defined HAVE___STRCHRNUL && !defined _LIBC 1.1526 + static char * 1.1527 +-__strchrnul (s, c) 1.1528 +- const char *s; 1.1529 +- int c; 1.1530 ++__strchrnul (const char *s, int c) 1.1531 + { 1.1532 + char *result = strchr (s, c); 1.1533 + if (result == NULL) 1.1534 +@@ -179,9 +177,7 @@ __strchrnul (s, c) 1.1535 + 1.1536 + # if HANDLE_MULTIBYTE && !defined HAVE___STRCHRNUL && !defined _LIBC 1.1537 + static wchar_t * 1.1538 +-__wcschrnul (s, c) 1.1539 +- const wchar_t *s; 1.1540 +- wint_t c; 1.1541 ++__wcschrnul (const wchar_t *s, wint_t c) 1.1542 + { 1.1543 + wchar_t *result = wcschr (s, c); 1.1544 + if (result == NULL) 1.1545 +@@ -327,10 +323,7 @@ is_char_class (const wchar_t *wcs) 1.1546 + 1.1547 + 1.1548 + int 1.1549 +-fnmatch (pattern, string, flags) 1.1550 +- const char *pattern; 1.1551 +- const char *string; 1.1552 +- int flags; 1.1553 ++fnmatch (const char *pattern, const char *string, int flags) 1.1554 + { 1.1555 + # if HANDLE_MULTIBYTE 1.1556 + if (__builtin_expect (MB_CUR_MAX, 1) != 1) 1.1557 +diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c 1.1558 +index f46c9dfedb..8d4049d6dc 100644 1.1559 +--- a/posix/fnmatch_loop.c 1.1560 ++++ b/posix/fnmatch_loop.c 1.1561 +@@ -38,14 +38,8 @@ static const CHAR *END (const CHAR *patternp) internal_function; 1.1562 + 1.1563 + static int 1.1564 + internal_function 1.1565 +-FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used) 1.1566 +- const CHAR *pattern; 1.1567 +- const CHAR *string; 1.1568 +- const CHAR *string_end; 1.1569 +- int no_leading_period; 1.1570 +- int flags; 1.1571 +- struct STRUCT *ends; 1.1572 +- size_t alloca_used; 1.1573 ++FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, 1.1574 ++ int no_leading_period, int flags, struct STRUCT *ends, size_t alloca_used) 1.1575 + { 1.1576 + const CHAR *p = pattern, *n = string; 1.1577 + UCHAR c; 1.1578 +diff --git a/posix/glob.c b/posix/glob.c 1.1579 +index d65e55dcd6..d178cf0206 100644 1.1580 +--- a/posix/glob.c 1.1581 ++++ b/posix/glob.c 1.1582 +@@ -1267,8 +1267,7 @@ libc_hidden_def (glob) 1.1583 + 1.1584 + /* Free storage allocated in PGLOB by a previous `glob' call. */ 1.1585 + void 1.1586 +-globfree (pglob) 1.1587 +- glob_t *pglob; 1.1588 ++globfree (glob_t *pglob) 1.1589 + { 1.1590 + if (pglob->gl_pathv != NULL) 1.1591 + { 1.1592 +@@ -1363,9 +1362,7 @@ prefix_array (const char *dirname, char **array, size_t n) 1.1593 + /* We must not compile this function twice. */ 1.1594 + #if !defined _LIBC || !defined NO_GLOB_PATTERN_P 1.1595 + int 1.1596 +-__glob_pattern_type (pattern, quote) 1.1597 +- const char *pattern; 1.1598 +- int quote; 1.1599 ++__glob_pattern_type (const char *pattern, int quote) 1.1600 + { 1.1601 + const char *p; 1.1602 + int ret = 0; 1.1603 +@@ -1402,9 +1399,7 @@ __glob_pattern_type (pattern, quote) 1.1604 + /* Return nonzero if PATTERN contains any metacharacters. 1.1605 + Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ 1.1606 + int 1.1607 +-__glob_pattern_p (pattern, quote) 1.1608 +- const char *pattern; 1.1609 +- int quote; 1.1610 ++__glob_pattern_p (const char *pattern, int quote) 1.1611 + { 1.1612 + return __glob_pattern_type (pattern, quote) == 1; 1.1613 + } 1.1614 +diff --git a/posix/regcomp.c b/posix/regcomp.c 1.1615 +index bf8aa1604c..c8e0c79219 100644 1.1616 +--- a/posix/regcomp.c 1.1617 ++++ b/posix/regcomp.c 1.1618 +@@ -216,10 +216,8 @@ const size_t __re_error_msgid_idx[] attribute_hidden = 1.1619 + are set in BUFP on entry. */ 1.1620 + 1.1621 + const char * 1.1622 +-re_compile_pattern (pattern, length, bufp) 1.1623 +- const char *pattern; 1.1624 +- size_t length; 1.1625 +- struct re_pattern_buffer *bufp; 1.1626 ++re_compile_pattern (const char *pattern, size_t length, 1.1627 ++ struct re_pattern_buffer *bufp) 1.1628 + { 1.1629 + reg_errcode_t ret; 1.1630 + 1.1631 +@@ -257,8 +255,7 @@ reg_syntax_t re_syntax_options; 1.1632 + defined in regex.h. We return the old syntax. */ 1.1633 + 1.1634 + reg_syntax_t 1.1635 +-re_set_syntax (syntax) 1.1636 +- reg_syntax_t syntax; 1.1637 ++re_set_syntax (reg_syntax_t syntax) 1.1638 + { 1.1639 + reg_syntax_t ret = re_syntax_options; 1.1640 + 1.1641 +@@ -270,8 +267,7 @@ weak_alias (__re_set_syntax, re_set_syntax) 1.1642 + #endif 1.1643 + 1.1644 + int 1.1645 +-re_compile_fastmap (bufp) 1.1646 +- struct re_pattern_buffer *bufp; 1.1647 ++re_compile_fastmap (struct re_pattern_buffer *bufp) 1.1648 + { 1.1649 + re_dfa_t *dfa = (re_dfa_t *) bufp->buffer; 1.1650 + char *fastmap = bufp->fastmap; 1.1651 +@@ -469,10 +465,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, 1.1652 + the return codes and their meanings.) */ 1.1653 + 1.1654 + int 1.1655 +-regcomp (preg, pattern, cflags) 1.1656 +- regex_t *__restrict preg; 1.1657 +- const char *__restrict pattern; 1.1658 +- int cflags; 1.1659 ++regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags) 1.1660 + { 1.1661 + reg_errcode_t ret; 1.1662 + reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED 1.1663 +@@ -531,11 +524,8 @@ weak_alias (__regcomp, regcomp) 1.1664 + from either regcomp or regexec. We don't use PREG here. */ 1.1665 + 1.1666 + size_t 1.1667 +-regerror (errcode, preg, errbuf, errbuf_size) 1.1668 +- int errcode; 1.1669 +- const regex_t *__restrict preg; 1.1670 +- char *__restrict errbuf; 1.1671 +- size_t errbuf_size; 1.1672 ++regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf, 1.1673 ++ size_t errbuf_size) 1.1674 + { 1.1675 + const char *msg; 1.1676 + size_t msg_size; 1.1677 +@@ -639,8 +629,7 @@ free_dfa_content (re_dfa_t *dfa) 1.1678 + /* Free dynamically allocated space used by PREG. */ 1.1679 + 1.1680 + void 1.1681 +-regfree (preg) 1.1682 +- regex_t *preg; 1.1683 ++regfree (regex_t *preg) 1.1684 + { 1.1685 + re_dfa_t *dfa = (re_dfa_t *) preg->buffer; 1.1686 + if (BE (dfa != NULL, 1)) 1.1687 +diff --git a/posix/regexec.c b/posix/regexec.c 1.1688 +index 70cd6064dd..f748a314bb 100644 1.1689 +--- a/posix/regexec.c 1.1690 ++++ b/posix/regexec.c 1.1691 +@@ -219,12 +219,8 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len) 1.1692 + We return 0 if we find a match and REG_NOMATCH if not. */ 1.1693 + 1.1694 + int 1.1695 +-regexec (preg, string, nmatch, pmatch, eflags) 1.1696 +- const regex_t *__restrict preg; 1.1697 +- const char *__restrict string; 1.1698 +- size_t nmatch; 1.1699 +- regmatch_t pmatch[]; 1.1700 +- int eflags; 1.1701 ++regexec (const regex_t *__restrict preg, const char *__restrict string, 1.1702 ++ size_t nmatch, regmatch_t pmatch[], int eflags) 1.1703 + { 1.1704 + reg_errcode_t err; 1.1705 + int start, length; 1.1706 +@@ -305,11 +301,8 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0); 1.1707 + match was found and -2 indicates an internal error. */ 1.1708 + 1.1709 + int 1.1710 +-re_match (bufp, string, length, start, regs) 1.1711 +- struct re_pattern_buffer *bufp; 1.1712 +- const char *string; 1.1713 +- int length, start; 1.1714 +- struct re_registers *regs; 1.1715 ++re_match (struct re_pattern_buffer *bufp, const char *string, int length, 1.1716 ++ int start, struct re_registers *regs) 1.1717 + { 1.1718 + return re_search_stub (bufp, string, length, start, 0, length, regs, 1); 1.1719 + } 1.1720 +@@ -318,11 +311,8 @@ weak_alias (__re_match, re_match) 1.1721 + #endif 1.1722 + 1.1723 + int 1.1724 +-re_search (bufp, string, length, start, range, regs) 1.1725 +- struct re_pattern_buffer *bufp; 1.1726 +- const char *string; 1.1727 +- int length, start, range; 1.1728 +- struct re_registers *regs; 1.1729 ++re_search (struct re_pattern_buffer *bufp, const char *string, int length, 1.1730 ++ int start, int range, struct re_registers *regs) 1.1731 + { 1.1732 + return re_search_stub (bufp, string, length, start, range, length, regs, 0); 1.1733 + } 1.1734 +@@ -331,11 +321,9 @@ weak_alias (__re_search, re_search) 1.1735 + #endif 1.1736 + 1.1737 + int 1.1738 +-re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop) 1.1739 +- struct re_pattern_buffer *bufp; 1.1740 +- const char *string1, *string2; 1.1741 +- int length1, length2, start, stop; 1.1742 +- struct re_registers *regs; 1.1743 ++re_match_2 (struct re_pattern_buffer *bufp, const char *string1, int length1, 1.1744 ++ const char *string2, int length2, int start, 1.1745 ++ struct re_registers *regs, int stop) 1.1746 + { 1.1747 + return re_search_2_stub (bufp, string1, length1, string2, length2, 1.1748 + start, 0, regs, stop, 1); 1.1749 +@@ -345,11 +333,9 @@ weak_alias (__re_match_2, re_match_2) 1.1750 + #endif 1.1751 + 1.1752 + int 1.1753 +-re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop) 1.1754 +- struct re_pattern_buffer *bufp; 1.1755 +- const char *string1, *string2; 1.1756 +- int length1, length2, start, range, stop; 1.1757 +- struct re_registers *regs; 1.1758 ++re_search_2 (struct re_pattern_buffer *bufp, const char *string1, int length1, 1.1759 ++ const char *string2, int length2, int start, int range, 1.1760 ++ struct re_registers *regs, int stop) 1.1761 + { 1.1762 + return re_search_2_stub (bufp, string1, length1, string2, length2, 1.1763 + start, range, regs, stop, 0); 1.1764 +@@ -406,11 +392,10 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, 1.1765 + otherwise the position of the match is returned. */ 1.1766 + 1.1767 + static int 1.1768 +-re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) 1.1769 +- struct re_pattern_buffer *bufp; 1.1770 +- const char *string; 1.1771 +- int length, start, range, stop, ret_len; 1.1772 +- struct re_registers *regs; 1.1773 ++internal_function 1.1774 ++re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length, 1.1775 ++ int start, int range, int stop, struct re_registers *regs, 1.1776 ++ int ret_len) 1.1777 + { 1.1778 + reg_errcode_t result; 1.1779 + regmatch_t *pmatch; 1.1780 +@@ -495,10 +480,9 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len) 1.1781 + } 1.1782 + 1.1783 + static unsigned 1.1784 +-re_copy_regs (regs, pmatch, nregs, regs_allocated) 1.1785 +- struct re_registers *regs; 1.1786 +- regmatch_t *pmatch; 1.1787 +- int nregs, regs_allocated; 1.1788 ++internal_function 1.1789 ++re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs, 1.1790 ++ int regs_allocated) 1.1791 + { 1.1792 + int rval = REGS_REALLOCATE; 1.1793 + int i; 1.1794 +@@ -575,11 +559,8 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated) 1.1795 + freeing the old data. */ 1.1796 + 1.1797 + void 1.1798 +-re_set_registers (bufp, regs, num_regs, starts, ends) 1.1799 +- struct re_pattern_buffer *bufp; 1.1800 +- struct re_registers *regs; 1.1801 +- unsigned num_regs; 1.1802 +- regoff_t *starts, *ends; 1.1803 ++re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs, 1.1804 ++ unsigned num_regs, regoff_t *starts, regoff_t *ends) 1.1805 + { 1.1806 + if (num_regs) 1.1807 + { 1.1808 +@@ -953,9 +934,8 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch, 1.1809 + } 1.1810 + 1.1811 + static reg_errcode_t 1.1812 +-__attribute_warn_unused_result__ 1.1813 +-prune_impossible_nodes (mctx) 1.1814 +- re_match_context_t *mctx; 1.1815 ++internal_function __attribute_warn_unused_result__ 1.1816 ++prune_impossible_nodes (re_match_context_t *mctx) 1.1817 + { 1.1818 + const re_dfa_t *const dfa = mctx->dfa; 1.1819 + int halt_node, match_last; 1.1820 +diff --git a/resolv/inet_net_pton.c b/resolv/inet_net_pton.c 1.1821 +index 14916f83f8..75a8515c15 100644 1.1822 +--- a/resolv/inet_net_pton.c 1.1823 ++++ b/resolv/inet_net_pton.c 1.1824 +@@ -54,11 +54,7 @@ static int inet_net_pton_ipv4 (const char *src, u_char *dst, 1.1825 + * Paul Vixie (ISC), June 1996 1.1826 + */ 1.1827 + int 1.1828 +-inet_net_pton(af, src, dst, size) 1.1829 +- int af; 1.1830 +- const char *src; 1.1831 +- void *dst; 1.1832 +- size_t size; 1.1833 ++inet_net_pton (int af, const char *src, void *dst, size_t size) 1.1834 + { 1.1835 + switch (af) { 1.1836 + case AF_INET: 1.1837 +@@ -86,10 +82,7 @@ inet_net_pton(af, src, dst, size) 1.1838 + * Paul Vixie (ISC), June 1996 1.1839 + */ 1.1840 + static int 1.1841 +-inet_net_pton_ipv4(src, dst, size) 1.1842 +- const char *src; 1.1843 +- u_char *dst; 1.1844 +- size_t size; 1.1845 ++inet_net_pton_ipv4 (const char *src, u_char *dst, size_t size) 1.1846 + { 1.1847 + static const char xdigits[] = "0123456789abcdef"; 1.1848 + int n, ch, tmp, dirty, bits; 1.1849 +diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c 1.1850 +index da8e4df1ce..f07b0f368b 100644 1.1851 +--- a/stdlib/strtod_l.c 1.1852 ++++ b/stdlib/strtod_l.c 1.1853 +@@ -487,11 +487,8 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, 1.1854 + return 0.0. If the number is too big to be represented, set `errno' to 1.1855 + ERANGE and return HUGE_VAL with the appropriate sign. */ 1.1856 + FLOAT 1.1857 +-____STRTOF_INTERNAL (nptr, endptr, group, loc) 1.1858 +- const STRING_TYPE *nptr; 1.1859 +- STRING_TYPE **endptr; 1.1860 +- int group; 1.1861 +- __locale_t loc; 1.1862 ++____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group, 1.1863 ++ __locale_t loc) 1.1864 + { 1.1865 + int negative; /* The sign of the number. */ 1.1866 + MPN_VAR (num); /* MP representation of the number. */ 1.1867 +diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c 1.1868 +index c1e12e4d0f..0106728cd6 100644 1.1869 +--- a/sysdeps/pthread/aio_cancel.c 1.1870 ++++ b/sysdeps/pthread/aio_cancel.c 1.1871 +@@ -38,9 +38,7 @@ 1.1872 + 1.1873 + 1.1874 + int 1.1875 +-aio_cancel (fildes, aiocbp) 1.1876 +- int fildes; 1.1877 +- struct aiocb *aiocbp; 1.1878 ++aio_cancel (int fildes, struct aiocb *aiocbp) 1.1879 + { 1.1880 + struct requestlist *req = NULL; 1.1881 + int result = AIO_ALLDONE; 1.1882 +diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c 1.1883 +index bfca6627f1..40726a8341 100644 1.1884 +--- a/sysdeps/pthread/aio_suspend.c 1.1885 ++++ b/sysdeps/pthread/aio_suspend.c 1.1886 +@@ -105,10 +105,8 @@ do_aio_misc_wait (unsigned int *cntr, const struct timespec *timeout) 1.1887 + #endif 1.1888 + 1.1889 + int 1.1890 +-aio_suspend (list, nent, timeout) 1.1891 +- const struct aiocb *const list[]; 1.1892 +- int nent; 1.1893 +- const struct timespec *timeout; 1.1894 ++aio_suspend (const struct aiocb *const list[], int nent, 1.1895 ++ const struct timespec *timeout) 1.1896 + { 1.1897 + if (__glibc_unlikely (nent < 0)) 1.1898 + { 1.1899 +diff --git a/sysdeps/pthread/timer_delete.c b/sysdeps/pthread/timer_delete.c 1.1900 +index ef0133f4ec..49f4c5bc70 100644 1.1901 +--- a/sysdeps/pthread/timer_delete.c 1.1902 ++++ b/sysdeps/pthread/timer_delete.c 1.1903 +@@ -26,8 +26,7 @@ 1.1904 + 1.1905 + /* Delete timer TIMERID. */ 1.1906 + int 1.1907 +-timer_delete (timerid) 1.1908 +- timer_t timerid; 1.1909 ++timer_delete (timer_t timerid) 1.1910 + { 1.1911 + struct timer_node *timer; 1.1912 + int retval = -1; 1.1913 +diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c 1.1914 +index 7d100bb321..7eea0ca8c6 100644 1.1915 +--- a/sysdeps/unix/sysv/linux/dl-openat64.c 1.1916 ++++ b/sysdeps/unix/sysv/linux/dl-openat64.c 1.1917 +@@ -23,10 +23,7 @@ 1.1918 + 1.1919 + 1.1920 + int 1.1921 +-openat64 (dfd, file, oflag) 1.1922 +- int dfd; 1.1923 +- const char *file; 1.1924 +- int oflag; 1.1925 ++openat64 (int dfd, const char *file, int oflag, ...) 1.1926 + { 1.1927 + assert (!__OPEN_NEEDS_MODE (oflag)); 1.1928 + 1.1929 +diff --git a/time/strptime_l.c b/time/strptime_l.c 1.1930 +index c3ce50fe10..454c6ad6c4 100644 1.1931 +--- a/time/strptime_l.c 1.1932 ++++ b/time/strptime_l.c 1.1933 +@@ -41,9 +41,7 @@ 1.1934 + # define localtime_r my_localtime_r 1.1935 + static struct tm *localtime_r (const time_t *, struct tm *); 1.1936 + static struct tm * 1.1937 +-localtime_r (t, tp) 1.1938 +- const time_t *t; 1.1939 +- struct tm *tp; 1.1940 ++localtime_r (const time_t *t, struct tm *tp) 1.1941 + { 1.1942 + struct tm *l = localtime (t); 1.1943 + if (! l) 1.1944 +diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c 1.1945 +index 9c354a939b..73a5c7f0c5 100644 1.1946 +--- a/wcsmbs/mbsnrtowcs.c 1.1947 ++++ b/wcsmbs/mbsnrtowcs.c 1.1948 +@@ -38,12 +38,8 @@ static mbstate_t state; 1.1949 + implementation of stdio because we have to deal with unterminated 1.1950 + buffers. At most NMC bytes will be converted. */ 1.1951 + size_t 1.1952 +-__mbsnrtowcs (dst, src, nmc, len, ps) 1.1953 +- wchar_t *dst; 1.1954 +- const char **src; 1.1955 +- size_t nmc; 1.1956 +- size_t len; 1.1957 +- mbstate_t *ps; 1.1958 ++__mbsnrtowcs (wchar_t *dst, const char **src, size_t nmc, size_t len, 1.1959 ++ mbstate_t *ps) 1.1960 + { 1.1961 + const unsigned char *srcend; 1.1962 + struct __gconv_step_data data; 1.1963 +diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c 1.1964 +index 557b3ed7bc..d71934117d 100644 1.1965 +--- a/wcsmbs/mbsrtowcs_l.c 1.1966 ++++ b/wcsmbs/mbsrtowcs_l.c 1.1967 +@@ -37,12 +37,8 @@ 1.1968 + 1.1969 + size_t 1.1970 + attribute_hidden 1.1971 +-__mbsrtowcs_l (dst, src, len, ps, l) 1.1972 +- wchar_t *dst; 1.1973 +- const char **src; 1.1974 +- size_t len; 1.1975 +- mbstate_t *ps; 1.1976 +- __locale_t l; 1.1977 ++__mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, mbstate_t *ps, 1.1978 ++ __locale_t l) 1.1979 + { 1.1980 + struct __gconv_step_data data; 1.1981 + size_t result; 1.1982 +diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c 1.1983 +index df83c94391..f257693aba 100644 1.1984 +--- a/wcsmbs/wcsnrtombs.c 1.1985 ++++ b/wcsmbs/wcsnrtombs.c 1.1986 +@@ -37,12 +37,8 @@ static mbstate_t state; 1.1987 + implementation of stdio because we have to deal with unterminated 1.1988 + buffers. At most NWC wide character will be converted. */ 1.1989 + size_t 1.1990 +-__wcsnrtombs (dst, src, nwc, len, ps) 1.1991 +- char *dst; 1.1992 +- const wchar_t **src; 1.1993 +- size_t nwc; 1.1994 +- size_t len; 1.1995 +- mbstate_t *ps; 1.1996 ++__wcsnrtombs (char *dst, const wchar_t **src, size_t nwc, size_t len, 1.1997 ++ mbstate_t *ps) 1.1998 + { 1.1999 + struct __gconv_step_data data; 1.2000 + const wchar_t *srcend; 1.2001 +diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c 1.2002 +index bc8e7b8141..ae30368338 100644 1.2003 +--- a/wcsmbs/wcsrtombs.c 1.2004 ++++ b/wcsmbs/wcsrtombs.c 1.2005 +@@ -35,11 +35,7 @@ 1.2006 + static mbstate_t state; 1.2007 + 1.2008 + size_t 1.2009 +-__wcsrtombs (dst, src, len, ps) 1.2010 +- char *dst; 1.2011 +- const wchar_t **src; 1.2012 +- size_t len; 1.2013 +- mbstate_t *ps; 1.2014 ++__wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps) 1.2015 + { 1.2016 + struct __gconv_step_data data; 1.2017 + int status; 1.2018 +-- 1.2019 +2.39.1