wok-current view glibc/stuff/glibc-2.21-gcc6_fix-2.patch @ rev 25712
Use symlink for libxvmc-mesa
| author | Stanislas Leduc <shann@slitaz.org> |
|---|---|
| date | Mon Jun 10 20:42:21 2024 +0000 (3 months ago) |
| parents | |
| children |
line source
1 From 9dd346ff431fc761f1b748bd4da8bb59f7652094 Mon Sep 17 00:00:00 2001
2 From: Joseph Myers <joseph@codesourcery.com>
3 Date: Tue, 20 Oct 2015 11:54:09 +0000
4 Subject: [PATCH] Convert 113 more function definitions to prototype style
5 (files with assertions).
7 This mostly automatically-generated patch converts 113 function
8 definitions in glibc from old-style K&R to prototype-style. Following
9 my other recent such patches, this one deals with the case of function
10 definitions in files that either contain assertions or where grep
11 suggested they might contain assertions - and thus where it isn't
12 possible to use a simple object code comparison as a sanity check on
13 the correctness of the patch, because line numbers are changed.
15 A few such automatically-generated changes needed to be supplemented
16 by manual changes for the result to compile. openat64 had a prototype
17 declaration with "..." but an old-style definition in
18 sysdeps/unix/sysv/linux/dl-openat64.c, and "..." needed adding to the
19 generated prototype in the definition (I've filed
20 <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68024> for diagnosing
21 such cases in GCC; the old state was undefined behavior not requiring
22 a diagnostic, but one seems a good idea). In addition, as Florian has
23 noted regparm attribute mismatches between declaration and definition
24 are only diagnosed for prototype definitions, and five functions
25 needed internal_function added to their definitions (in the case of
26 __pthread_mutex_cond_lock, via the macro definition of
27 __pthread_mutex_lock) to compile on i386.
29 After this patch is in, remaining old-style definitions are probably
30 most readily fixed manually before we can turn on
31 -Wold-style-definition for all builds.
33 Tested for x86_64 and x86 (testsuite).
35 * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
36 function definition.
37 * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
38 * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
39 * debug/backtracesyms.c (__backtrace_symbols): Likewise.
40 * elf/dl-minimal.c (_itoa): Likewise.
41 * hurd/hurdmalloc.c (malloc): Likewise.
42 (free): Likewise.
43 (realloc): Likewise.
44 * inet/inet6_option.c (inet6_option_space): Likewise.
45 (inet6_option_init): Likewise.
46 (inet6_option_append): Likewise.
47 (inet6_option_alloc): Likewise.
48 (inet6_option_next): Likewise.
49 (inet6_option_find): Likewise.
50 * io/ftw.c (FTW_NAME): Likewise.
51 (NFTW_NAME): Likewise.
52 (NFTW_NEW_NAME): Likewise.
53 (NFTW_OLD_NAME): Likewise.
54 * libio/iofwide.c (_IO_fwide): Likewise.
55 * libio/strops.c (_IO_str_init_static_internal): Likewise.
56 (_IO_str_init_static): Likewise.
57 (_IO_str_init_readonly): Likewise.
58 (_IO_str_overflow): Likewise.
59 (_IO_str_underflow): Likewise.
60 (_IO_str_count): Likewise.
61 (_IO_str_seekoff): Likewise.
62 (_IO_str_pbackfail): Likewise.
63 (_IO_str_finish): Likewise.
64 * libio/wstrops.c (_IO_wstr_init_static): Likewise.
65 (_IO_wstr_overflow): Likewise.
66 (_IO_wstr_underflow): Likewise.
67 (_IO_wstr_count): Likewise.
68 (_IO_wstr_seekoff): Likewise.
69 (_IO_wstr_pbackfail): Likewise.
70 (_IO_wstr_finish): Likewise.
71 * locale/programs/localedef.c (normalize_codeset): Likewise.
72 * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
73 (add_locales_to_archive): Likewise.
74 (delete_locales_from_archive): Likewise.
75 * malloc/malloc.c (__libc_mallinfo): Likewise.
76 * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
77 * misc/tsearch.c (__tfind): Likewise.
78 * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
79 * nptl/pthread_attr_getdetachstate.c
80 (__pthread_attr_getdetachstate): Likewise.
81 * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
82 Likewise.
83 * nptl/pthread_attr_getinheritsched.c
84 (__pthread_attr_getinheritsched): Likewise.
85 * nptl/pthread_attr_getschedparam.c
86 (__pthread_attr_getschedparam): Likewise.
87 * nptl/pthread_attr_getschedpolicy.c
88 (__pthread_attr_getschedpolicy): Likewise.
89 * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
90 Likewise.
91 * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
92 Likewise.
93 * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
94 Likewise.
95 * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
96 Likewise.
97 * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
98 (__pthread_attr_init_2_0): Likewise.
99 * nptl/pthread_attr_setdetachstate.c
100 (__pthread_attr_setdetachstate): Likewise.
101 * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
102 Likewise.
103 * nptl/pthread_attr_setinheritsched.c
104 (__pthread_attr_setinheritsched): Likewise.
105 * nptl/pthread_attr_setschedparam.c
106 (__pthread_attr_setschedparam): Likewise.
107 * nptl/pthread_attr_setschedpolicy.c
108 (__pthread_attr_setschedpolicy): Likewise.
109 * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
110 Likewise.
111 * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
112 Likewise.
113 * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
114 Likewise.
115 * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
116 Likewise.
117 * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
118 Likewise.
119 * nptl/pthread_create.c (__find_in_stack_list): Likewise.
120 * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
121 * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
122 use internal_function.
123 * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
124 prototype-style function definition.
125 * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
126 (__pthread_mutex_cond_lock_adjust): Likewise. Use
127 internal_function.
128 * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
129 Convert to prototype-style function definition.
130 * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
131 Likewise.
132 * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
133 Likewise.
134 (__pthread_mutex_unlock): Likewise.
135 * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
136 * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
137 * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
138 * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
139 * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
140 * nss/makedb.c (process_input): Likewise.
141 * posix/fnmatch.c (__strchrnul): Likewise.
142 (__wcschrnul): Likewise.
143 (fnmatch): Likewise.
144 * posix/fnmatch_loop.c (FCT): Likewise.
145 * posix/glob.c (globfree): Likewise.
146 (__glob_pattern_type): Likewise.
147 (__glob_pattern_p): Likewise.
148 * posix/regcomp.c (re_compile_pattern): Likewise.
149 (re_set_syntax): Likewise.
150 (re_compile_fastmap): Likewise.
151 (regcomp): Likewise.
152 (regerror): Likewise.
153 (regfree): Likewise.
154 * posix/regexec.c (regexec): Likewise.
155 (re_match): Likewise.
156 (re_search): Likewise.
157 (re_match_2): Likewise.
158 (re_search_2): Likewise.
159 (re_search_stub): Likewise. Use internal_function
160 (re_copy_regs): Likewise.
161 (re_set_registers): Convert to prototype-style function
162 definition.
163 (prune_impossible_nodes): Likewise. Use internal_function.
164 * resolv/inet_net_pton.c (inet_net_pton): Convert to
165 prototype-style function definition.
166 (inet_net_pton_ipv4): Likewise.
167 * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
168 * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
169 * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
170 * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
171 * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
172 Make variadic.
173 * time/strptime_l.c (localtime_r): Convert to prototype-style
174 function definition.
175 * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
176 * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
177 * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
178 * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
179 ---
180 ChangeLog | 145 ++++++++++++++++++++++++++
181 crypt/md5-crypt.c | 6 +-
182 crypt/sha256-crypt.c | 6 +-
183 crypt/sha512-crypt.c | 6 +-
184 debug/backtracesyms.c | 4 +-
185 elf/dl-minimal.c | 7 +-
186 hurd/hurdmalloc.c | 10 +-
187 inet/inet6_option.c | 30 ++----
188 io/ftw.c | 23 +---
189 libio/iofwide.c | 4 +-
190 libio/strops.c | 42 ++------
191 libio/wstrops.c | 31 ++----
192 locale/programs/localedef.c | 4 +-
193 locale/programs/locarchive.c | 16 +--
194 malloc/malloc.c | 2 +-
195 math/gen-auto-libm-tests.c | 2 +-
196 misc/tsearch.c | 5 +-
197 nptl/pthread_attr_destroy.c | 3 +-
198 nptl/pthread_attr_getdetachstate.c | 4 +-
199 nptl/pthread_attr_getguardsize.c | 4 +-
200 nptl/pthread_attr_getinheritsched.c | 4 +-
201 nptl/pthread_attr_getschedparam.c | 5 +-
202 nptl/pthread_attr_getschedpolicy.c | 4 +-
203 nptl/pthread_attr_getscope.c | 4 +-
204 nptl/pthread_attr_getstack.c | 6 +-
205 nptl/pthread_attr_getstackaddr.c | 4 +-
206 nptl/pthread_attr_getstacksize.c | 4 +-
207 nptl/pthread_attr_init.c | 6 +-
208 nptl/pthread_attr_setdetachstate.c | 4 +-
209 nptl/pthread_attr_setguardsize.c | 4 +-
210 nptl/pthread_attr_setinheritsched.c | 4 +-
211 nptl/pthread_attr_setschedparam.c | 5 +-
212 nptl/pthread_attr_setschedpolicy.c | 4 +-
213 nptl/pthread_attr_setscope.c | 4 +-
214 nptl/pthread_attr_setstack.c | 6 +-
215 nptl/pthread_attr_setstackaddr.c | 4 +-
216 nptl/pthread_attr_setstacksize.c | 4 +-
217 nptl/pthread_condattr_setclock.c | 4 +-
218 nptl/pthread_create.c | 3 +-
219 nptl/pthread_getattr_np.c | 4 +-
220 nptl/pthread_mutex_cond_lock.c | 2 +-
221 nptl/pthread_mutex_init.c | 5 +-
222 nptl/pthread_mutex_lock.c | 7 +-
223 nptl/pthread_mutex_timedlock.c | 5 +-
224 nptl/pthread_mutex_trylock.c | 3 +-
225 nptl/pthread_mutex_unlock.c | 7 +-
226 nptl_db/td_ta_clear_event.c | 4 +-
227 nptl_db/td_ta_set_event.c | 4 +-
228 nptl_db/td_thr_clear_event.c | 4 +-
229 nptl_db/td_thr_event_enable.c | 4 +-
230 nptl_db/td_thr_set_event.c | 4 +-
231 nss/makedb.c | 6 +-
232 posix/fnmatch.c | 13 +--
233 posix/fnmatch_loop.c | 10 +-
234 posix/glob.c | 11 +-
235 posix/regcomp.c | 27 ++---
236 posix/regexec.c | 66 ++++--------
237 resolv/inet_net_pton.c | 11 +-
238 stdlib/strtod_l.c | 7 +-
239 sysdeps/pthread/aio_cancel.c | 4 +-
240 sysdeps/pthread/aio_suspend.c | 6 +-
241 sysdeps/pthread/timer_delete.c | 3 +-
242 sysdeps/unix/sysv/linux/dl-openat64.c | 5 +-
243 time/strptime_l.c | 4 +-
244 wcsmbs/mbsnrtowcs.c | 8 +-
245 wcsmbs/mbsrtowcs_l.c | 8 +-
246 wcsmbs/wcsnrtombs.c | 8 +-
247 wcsmbs/wcsrtombs.c | 6 +-
248 68 files changed, 293 insertions(+), 400 deletions(-)
250 diff --git a/ChangeLog b/ChangeLog
251 index 685fad5a8e..9e7c455c56 100644
252 --- a/ChangeLog
253 +++ b/ChangeLog
254 @@ -1,5 +1,150 @@
255 2015-10-20 Joseph Myers <joseph@codesourcery.com>
257 + * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style
258 + function definition.
259 + * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise.
260 + * crypt/sha512-crypt.c (__sha512_crypt_r): Likewise.
261 + * debug/backtracesyms.c (__backtrace_symbols): Likewise.
262 + * elf/dl-minimal.c (_itoa): Likewise.
263 + * hurd/hurdmalloc.c (malloc): Likewise.
264 + (free): Likewise.
265 + (realloc): Likewise.
266 + * inet/inet6_option.c (inet6_option_space): Likewise.
267 + (inet6_option_init): Likewise.
268 + (inet6_option_append): Likewise.
269 + (inet6_option_alloc): Likewise.
270 + (inet6_option_next): Likewise.
271 + (inet6_option_find): Likewise.
272 + * io/ftw.c (FTW_NAME): Likewise.
273 + (NFTW_NAME): Likewise.
274 + (NFTW_NEW_NAME): Likewise.
275 + (NFTW_OLD_NAME): Likewise.
276 + * libio/iofwide.c (_IO_fwide): Likewise.
277 + * libio/strops.c (_IO_str_init_static_internal): Likewise.
278 + (_IO_str_init_static): Likewise.
279 + (_IO_str_init_readonly): Likewise.
280 + (_IO_str_overflow): Likewise.
281 + (_IO_str_underflow): Likewise.
282 + (_IO_str_count): Likewise.
283 + (_IO_str_seekoff): Likewise.
284 + (_IO_str_pbackfail): Likewise.
285 + (_IO_str_finish): Likewise.
286 + * libio/wstrops.c (_IO_wstr_init_static): Likewise.
287 + (_IO_wstr_overflow): Likewise.
288 + (_IO_wstr_underflow): Likewise.
289 + (_IO_wstr_count): Likewise.
290 + (_IO_wstr_seekoff): Likewise.
291 + (_IO_wstr_pbackfail): Likewise.
292 + (_IO_wstr_finish): Likewise.
293 + * locale/programs/localedef.c (normalize_codeset): Likewise.
294 + * locale/programs/locarchive.c (add_locale_to_archive): Likewise.
295 + (add_locales_to_archive): Likewise.
296 + (delete_locales_from_archive): Likewise.
297 + * malloc/malloc.c (__libc_mallinfo): Likewise.
298 + * math/gen-auto-libm-tests.c (init_fp_formats): Likewise.
299 + * misc/tsearch.c (__tfind): Likewise.
300 + * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Likewise.
301 + * nptl/pthread_attr_getdetachstate.c
302 + (__pthread_attr_getdetachstate): Likewise.
303 + * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize):
304 + Likewise.
305 + * nptl/pthread_attr_getinheritsched.c
306 + (__pthread_attr_getinheritsched): Likewise.
307 + * nptl/pthread_attr_getschedparam.c
308 + (__pthread_attr_getschedparam): Likewise.
309 + * nptl/pthread_attr_getschedpolicy.c
310 + (__pthread_attr_getschedpolicy): Likewise.
311 + * nptl/pthread_attr_getscope.c (__pthread_attr_getscope):
312 + Likewise.
313 + * nptl/pthread_attr_getstack.c (__pthread_attr_getstack):
314 + Likewise.
315 + * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr):
316 + Likewise.
317 + * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize):
318 + Likewise.
319 + * nptl/pthread_attr_init.c (__pthread_attr_init_2_1): Likewise.
320 + (__pthread_attr_init_2_0): Likewise.
321 + * nptl/pthread_attr_setdetachstate.c
322 + (__pthread_attr_setdetachstate): Likewise.
323 + * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize):
324 + Likewise.
325 + * nptl/pthread_attr_setinheritsched.c
326 + (__pthread_attr_setinheritsched): Likewise.
327 + * nptl/pthread_attr_setschedparam.c
328 + (__pthread_attr_setschedparam): Likewise.
329 + * nptl/pthread_attr_setschedpolicy.c
330 + (__pthread_attr_setschedpolicy): Likewise.
331 + * nptl/pthread_attr_setscope.c (__pthread_attr_setscope):
332 + Likewise.
333 + * nptl/pthread_attr_setstack.c (__pthread_attr_setstack):
334 + Likewise.
335 + * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr):
336 + Likewise.
337 + * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize):
338 + Likewise.
339 + * nptl/pthread_condattr_setclock.c (pthread_condattr_setclock):
340 + Likewise.
341 + * nptl/pthread_create.c (__find_in_stack_list): Likewise.
342 + * nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
343 + * nptl/pthread_mutex_cond_lock.c (__pthread_mutex_lock): Define to
344 + use internal_function.
345 + * nptl/pthread_mutex_init.c (__pthread_mutex_init): Convert to
346 + prototype-style function definition.
347 + * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise.
348 + (__pthread_mutex_cond_lock_adjust): Likewise. Use
349 + internal_function.
350 + * nptl/pthread_mutex_timedlock.c (pthread_mutex_timedlock):
351 + Convert to prototype-style function definition.
352 + * nptl/pthread_mutex_trylock.c (__pthread_mutex_trylock):
353 + Likewise.
354 + * nptl/pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt):
355 + Likewise.
356 + (__pthread_mutex_unlock): Likewise.
357 + * nptl_db/td_ta_clear_event.c (td_ta_clear_event): Likewise.
358 + * nptl_db/td_ta_set_event.c (td_ta_set_event): Likewise.
359 + * nptl_db/td_thr_clear_event.c (td_thr_clear_event): Likewise.
360 + * nptl_db/td_thr_event_enable.c (td_thr_event_enable): Likewise.
361 + * nptl_db/td_thr_set_event.c (td_thr_set_event): Likewise.
362 + * nss/makedb.c (process_input): Likewise.
363 + * posix/fnmatch.c (__strchrnul): Likewise.
364 + (__wcschrnul): Likewise.
365 + (fnmatch): Likewise.
366 + * posix/fnmatch_loop.c (FCT): Likewise.
367 + * posix/glob.c (globfree): Likewise.
368 + (__glob_pattern_type): Likewise.
369 + (__glob_pattern_p): Likewise.
370 + * posix/regcomp.c (re_compile_pattern): Likewise.
371 + (re_set_syntax): Likewise.
372 + (re_compile_fastmap): Likewise.
373 + (regcomp): Likewise.
374 + (regerror): Likewise.
375 + (regfree): Likewise.
376 + * posix/regexec.c (regexec): Likewise.
377 + (re_match): Likewise.
378 + (re_search): Likewise.
379 + (re_match_2): Likewise.
380 + (re_search_2): Likewise.
381 + (re_search_stub): Likewise. Use internal_function
382 + (re_copy_regs): Likewise.
383 + (re_set_registers): Convert to prototype-style function
384 + definition.
385 + (prune_impossible_nodes): Likewise. Use internal_function.
386 + * resolv/inet_net_pton.c (inet_net_pton): Convert to
387 + prototype-style function definition.
388 + (inet_net_pton_ipv4): Likewise.
389 + * stdlib/strtod_l.c (____STRTOF_INTERNAL): Likewise.
390 + * sysdeps/pthread/aio_cancel.c (aio_cancel): Likewise.
391 + * sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
392 + * sysdeps/pthread/timer_delete.c (timer_delete): Likewise.
393 + * sysdeps/unix/sysv/linux/dl-openat64.c (openat64): Likewise.
394 + Make variadic.
395 + * time/strptime_l.c (localtime_r): Convert to prototype-style
396 + function definition.
397 + * wcsmbs/mbsnrtowcs.c (__mbsnrtowcs): Likewise.
398 + * wcsmbs/mbsrtowcs_l.c (__mbsrtowcs_l): Likewise.
399 + * wcsmbs/wcsnrtombs.c (__wcsnrtombs): Likewise.
400 + * wcsmbs/wcsrtombs.c (__wcsrtombs): Likewise.
401 +
402 * crypt/crypt.c (_ufc_doit_r): Convert to prototype-style function
403 definition.
404 (_ufc_doit_r): Likewise.
405 diff --git a/crypt/md5-crypt.c b/crypt/md5-crypt.c
406 index 1b890bc49a..dad5942dba 100644
407 --- a/crypt/md5-crypt.c
408 +++ b/crypt/md5-crypt.c
409 @@ -89,11 +89,7 @@ extern char *__md5_crypt (const char *key, const char *salt);
410 /* This entry point is equivalent to the `crypt' function in Unix
411 libcs. */
412 char *
413 -__md5_crypt_r (key, salt, buffer, buflen)
414 - const char *key;
415 - const char *salt;
416 - char *buffer;
417 - int buflen;
418 +__md5_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
419 {
420 unsigned char alt_result[16]
421 __attribute__ ((__aligned__ (__alignof__ (md5_uint32))));
422 diff --git a/crypt/sha256-crypt.c b/crypt/sha256-crypt.c
423 index d90e291aa7..96102e96c0 100644
424 --- a/crypt/sha256-crypt.c
425 +++ b/crypt/sha256-crypt.c
426 @@ -99,11 +99,7 @@ extern char *__sha256_crypt (const char *key, const char *salt);
429 char *
430 -__sha256_crypt_r (key, salt, buffer, buflen)
431 - const char *key;
432 - const char *salt;
433 - char *buffer;
434 - int buflen;
435 +__sha256_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
436 {
437 unsigned char alt_result[32]
438 __attribute__ ((__aligned__ (__alignof__ (uint32_t))));
439 diff --git a/crypt/sha512-crypt.c b/crypt/sha512-crypt.c
440 index 9c581abb00..925749277a 100644
441 --- a/crypt/sha512-crypt.c
442 +++ b/crypt/sha512-crypt.c
443 @@ -99,11 +99,7 @@ extern char *__sha512_crypt (const char *key, const char *salt);
446 char *
447 -__sha512_crypt_r (key, salt, buffer, buflen)
448 - const char *key;
449 - const char *salt;
450 - char *buffer;
451 - int buflen;
452 +__sha512_crypt_r (const char *key, const char *salt, char *buffer, int buflen)
453 {
454 unsigned char alt_result[64]
455 __attribute__ ((__aligned__ (__alignof__ (uint64_t))));
456 diff --git a/debug/backtracesyms.c b/debug/backtracesyms.c
457 index 2c7305c81b..c25681b416 100644
458 --- a/debug/backtracesyms.c
459 +++ b/debug/backtracesyms.c
460 @@ -34,9 +34,7 @@
463 char **
464 -__backtrace_symbols (array, size)
465 - void *const *array;
466 - int size;
467 +__backtrace_symbols (void *const *array, int size)
468 {
469 Dl_info info[size];
470 int status[size];
471 diff --git a/elf/dl-minimal.c b/elf/dl-minimal.c
472 index ec7fe88d30..9129e5b5f6 100644
473 --- a/elf/dl-minimal.c
474 +++ b/elf/dl-minimal.c
475 @@ -324,11 +324,8 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group)
476 also has to be present and it is never about speed when these
477 functions are used. */
478 char *
479 -_itoa (value, buflim, base, upper_case)
480 - unsigned long long int value;
481 - char *buflim;
482 - unsigned int base;
483 - int upper_case;
484 +_itoa (unsigned long long int value, char *buflim, unsigned int base,
485 + int upper_case)
486 {
487 assert (! upper_case);
489 diff --git a/hurd/hurdmalloc.c b/hurd/hurdmalloc.c
490 index 071abeb718..58c29fa07d 100644
491 --- a/hurd/hurdmalloc.c
492 +++ b/hurd/hurdmalloc.c
493 @@ -202,8 +202,7 @@ more_memory(int size, free_list_t fl)
495 /* Declaration changed to standard one for GNU. */
496 void *
497 -malloc(size)
498 - size_t size;
499 +malloc (size_t size)
500 {
501 int i, n;
502 free_list_t fl;
503 @@ -269,8 +268,7 @@ malloc(size)
505 /* Declaration changed to standard one for GNU. */
506 void
507 -free(base)
508 - void *base;
509 +free (void *base)
510 {
511 header_t h;
512 free_list_t fl;
513 @@ -318,9 +316,7 @@ free(base)
515 /* Declaration changed to standard one for GNU. */
516 void *
517 -realloc(old_base, new_size)
518 - void *old_base;
519 - size_t new_size;
520 +realloc (void *old_base, size_t new_size)
521 {
522 header_t h;
523 free_list_t fl;
524 diff --git a/inet/inet6_option.c b/inet/inet6_option.c
525 index 47ca82ffdc..070be3f9a6 100644
526 --- a/inet/inet6_option.c
527 +++ b/inet/inet6_option.c
528 @@ -88,8 +88,7 @@ static uint8_t *option_alloc (struct cmsghdr *cmsg, int datalen, int multx,
529 beginning (the value y in the alignment term "xn + y"), the type
530 byte, the length byte, and the option data. */
531 int
532 -inet6_option_space (nbytes)
533 - int nbytes;
534 +inet6_option_space (int nbytes)
535 {
536 /* Add room for the extension header. */
537 nbytes += sizeof (struct ip6_ext);
538 @@ -106,10 +105,7 @@ link_warning (inet6_option_space,
539 contain either Hop-by-Hop or Destination options. It returns 0 on
540 success or -1 on an error. */
541 int
542 -inet6_option_init (bp, cmsgp, type)
543 - void *bp;
544 - struct cmsghdr **cmsgp;
545 - int type;
546 +inet6_option_init (void *bp, struct cmsghdr **cmsgp, int type)
547 {
548 /* Only Hop-by-Hop or Destination options allowed. */
549 if (type != IPV6_HOPOPTS && type != IPV6_DSTOPTS)
550 @@ -143,11 +139,8 @@ link_warning (inet6_option_init,
551 inet6_option_init(). This function returns 0 if it succeeds or -1 on
552 an error. */
553 int
554 -inet6_option_append (cmsg, typep, multx, plusy)
555 - struct cmsghdr *cmsg;
556 - const uint8_t *typep;
557 - int multx;
558 - int plusy;
559 +inet6_option_append (struct cmsghdr *cmsg, const uint8_t *typep, int multx,
560 + int plusy)
561 {
562 /* typep is a pointer to the 8-bit option type. It is assumed that this
563 field is immediately followed by the 8-bit option data length field,
564 @@ -223,11 +216,7 @@ option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)
567 uint8_t *
568 -inet6_option_alloc (cmsg, datalen, multx, plusy)
569 - struct cmsghdr *cmsg;
570 - int datalen;
571 - int multx;
572 - int plusy;
573 +inet6_option_alloc (struct cmsghdr *cmsg, int datalen, int multx, int plusy)
574 {
575 return option_alloc (cmsg, datalen, multx, plusy);
576 }
577 @@ -245,9 +234,7 @@ link_warning (inet6_option_alloc,
578 to be processed, the return value is -1 and *tptrp is NULL. If an
579 error occurs, the return value is -1 and *tptrp is not NULL. */
580 int
581 -inet6_option_next (cmsg, tptrp)
582 - const struct cmsghdr *cmsg;
583 - uint8_t **tptrp;
584 +inet6_option_next (const struct cmsghdr *cmsg, uint8_t **tptrp)
585 {
586 /* Make sure it is an option of the right type. */
587 if (cmsg->cmsg_level != IPPROTO_IPV6
588 @@ -303,10 +290,7 @@ link_warning (inet6_option_next,
589 pointer to cmsghdr structure of which cmsg_level equals IPPROTO_IPV6
590 and cmsg_type equals either IPV6_HOPOPTS or IPV6_DSTOPTS. */
591 int
592 -inet6_option_find (cmsg, tptrp, type)
593 - const struct cmsghdr *cmsg;
594 - uint8_t **tptrp;
595 - int type;
596 +inet6_option_find (const struct cmsghdr *cmsg, uint8_t **tptrp, int type)
597 {
598 /* Make sure it is an option of the right type. */
599 if (cmsg->cmsg_level != IPPROTO_IPV6
600 diff --git a/io/ftw.c b/io/ftw.c
601 index b95da60bb0..beffba4630 100644
602 --- a/io/ftw.c
603 +++ b/io/ftw.c
604 @@ -817,21 +817,14 @@ ftw_startup (const char *dir, int is_nftw, void *func, int descriptors,
605 /* Entry points. */
607 int
608 -FTW_NAME (path, func, descriptors)
609 - const char *path;
610 - FTW_FUNC_T func;
611 - int descriptors;
612 +FTW_NAME (const char *path, FTW_FUNC_T func, int descriptors)
613 {
614 return ftw_startup (path, 0, func, descriptors, 0);
615 }
617 #ifndef _LIBC
618 int
619 -NFTW_NAME (path, func, descriptors, flags)
620 - const char *path;
621 - NFTW_FUNC_T func;
622 - int descriptors;
623 - int flags;
624 +NFTW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
625 {
626 return ftw_startup (path, 1, func, descriptors, flags);
627 }
628 @@ -842,11 +835,7 @@ NFTW_NAME (path, func, descriptors, flags)
629 int NFTW_NEW_NAME (const char *, NFTW_FUNC_T, int, int);
631 int
632 -NFTW_NEW_NAME (path, func, descriptors, flags)
633 - const char *path;
634 - NFTW_FUNC_T func;
635 - int descriptors;
636 - int flags;
637 +NFTW_NEW_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
638 {
639 if (flags
640 & ~(FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH | FTW_ACTIONRETVAL))
641 @@ -867,11 +856,7 @@ int NFTW_OLD_NAME (const char *, NFTW_FUNC_T, int, int);
643 int
644 attribute_compat_text_section
645 -NFTW_OLD_NAME (path, func, descriptors, flags)
646 - const char *path;
647 - NFTW_FUNC_T func;
648 - int descriptors;
649 - int flags;
650 +NFTW_OLD_NAME (const char *path, NFTW_FUNC_T func, int descriptors, int flags)
651 {
652 flags &= (FTW_PHYS | FTW_MOUNT | FTW_CHDIR | FTW_DEPTH);
653 return ftw_startup (path, 1, func, descriptors, flags);
654 diff --git a/libio/iofwide.c b/libio/iofwide.c
655 index 0c175d19d1..f48ebe1e2f 100644
656 --- a/libio/iofwide.c
657 +++ b/libio/iofwide.c
658 @@ -85,9 +85,7 @@ const struct _IO_codecvt __libio_codecvt =
659 the orientation first. */
660 #undef _IO_fwide
661 int
662 -_IO_fwide (fp, mode)
663 - _IO_FILE *fp;
664 - int mode;
665 +_IO_fwide (_IO_FILE *fp, int mode)
666 {
667 /* Normalize the value. */
668 mode = mode < 0 ? -1 : (mode == 0 ? 0 : 1);
669 diff --git a/libio/strops.c b/libio/strops.c
670 index 730dfc4ae1..aa5e700222 100644
671 --- a/libio/strops.c
672 +++ b/libio/strops.c
673 @@ -31,11 +31,8 @@
674 #include <stdio_ext.h>
676 void
677 -_IO_str_init_static_internal (sf, ptr, size, pstart)
678 - _IO_strfile *sf;
679 - char *ptr;
680 - _IO_size_t size;
681 - char *pstart;
682 +_IO_str_init_static_internal (_IO_strfile *sf, char *ptr, _IO_size_t size,
683 + char *pstart)
684 {
685 _IO_FILE *fp = &sf->_sbf._f;
686 char *end;
687 @@ -68,29 +65,20 @@ _IO_str_init_static_internal (sf, ptr, size, pstart)
688 }
690 void
691 -_IO_str_init_static (sf, ptr, size, pstart)
692 - _IO_strfile *sf;
693 - char *ptr;
694 - int size;
695 - char *pstart;
696 +_IO_str_init_static (_IO_strfile *sf, char *ptr, int size, char *pstart)
697 {
698 return _IO_str_init_static_internal (sf, ptr, size < 0 ? -1 : size, pstart);
699 }
701 void
702 -_IO_str_init_readonly (sf, ptr, size)
703 - _IO_strfile *sf;
704 - const char *ptr;
705 - int size;
706 +_IO_str_init_readonly (_IO_strfile *sf, const char *ptr, int size)
707 {
708 _IO_str_init_static_internal (sf, (char *) ptr, size < 0 ? -1 : size, NULL);
709 sf->_sbf._f._IO_file_flags |= _IO_NO_WRITES;
710 }
712 int
713 -_IO_str_overflow (fp, c)
714 - _IO_FILE *fp;
715 - int c;
716 +_IO_str_overflow (_IO_FILE *fp, int c)
717 {
718 int flush_only = c == EOF;
719 _IO_size_t pos;
720 @@ -151,8 +139,7 @@ _IO_str_overflow (fp, c)
721 libc_hidden_def (_IO_str_overflow)
723 int
724 -_IO_str_underflow (fp)
725 - _IO_FILE *fp;
726 +_IO_str_underflow (_IO_FILE *fp)
727 {
728 if (fp->_IO_write_ptr > fp->_IO_read_end)
729 fp->_IO_read_end = fp->_IO_write_ptr;
730 @@ -172,8 +159,7 @@ libc_hidden_def (_IO_str_underflow)
731 /* The size of the valid part of the buffer. */
733 _IO_ssize_t
734 -_IO_str_count (fp)
735 - _IO_FILE *fp;
736 +_IO_str_count (_IO_FILE *fp)
737 {
738 return ((fp->_IO_write_ptr > fp->_IO_read_end
739 ? fp->_IO_write_ptr : fp->_IO_read_end)
740 @@ -246,11 +232,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
743 _IO_off64_t
744 -_IO_str_seekoff (fp, offset, dir, mode)
745 - _IO_FILE *fp;
746 - _IO_off64_t offset;
747 - int dir;
748 - int mode;
749 +_IO_str_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)
750 {
751 _IO_off64_t new_pos;
753 @@ -323,9 +305,7 @@ _IO_str_seekoff (fp, offset, dir, mode)
754 libc_hidden_def (_IO_str_seekoff)
756 int
757 -_IO_str_pbackfail (fp, c)
758 - _IO_FILE *fp;
759 - int c;
760 +_IO_str_pbackfail (_IO_FILE *fp, int c)
761 {
762 if ((fp->_flags & _IO_NO_WRITES) && c != EOF)
763 return EOF;
764 @@ -334,9 +314,7 @@ _IO_str_pbackfail (fp, c)
765 libc_hidden_def (_IO_str_pbackfail)
767 void
768 -_IO_str_finish (fp, dummy)
769 - _IO_FILE *fp;
770 - int dummy;
771 +_IO_str_finish (_IO_FILE *fp, int dummy)
772 {
773 if (fp->_IO_buf_base && !(fp->_flags & _IO_USER_BUF))
774 (((_IO_strfile *) fp)->_s._free_buffer) (fp->_IO_buf_base);
775 diff --git a/libio/wstrops.c b/libio/wstrops.c
776 index 3993579bd1..eeb9fb20d8 100644
777 --- a/libio/wstrops.c
778 +++ b/libio/wstrops.c
779 @@ -32,11 +32,8 @@
780 #include <stdio_ext.h>
782 void
783 -_IO_wstr_init_static (fp, ptr, size, pstart)
784 - _IO_FILE *fp;
785 - wchar_t *ptr;
786 - _IO_size_t size;
787 - wchar_t *pstart;
788 +_IO_wstr_init_static (_IO_FILE *fp, wchar_t *ptr, _IO_size_t size,
789 + wchar_t *pstart)
790 {
791 wchar_t *end;
793 @@ -70,9 +67,7 @@ _IO_wstr_init_static (fp, ptr, size, pstart)
794 }
796 _IO_wint_t
797 -_IO_wstr_overflow (fp, c)
798 - _IO_FILE *fp;
799 - _IO_wint_t c;
800 +_IO_wstr_overflow (_IO_FILE *fp, _IO_wint_t c)
801 {
802 int flush_only = c == WEOF;
803 _IO_size_t pos;
804 @@ -142,8 +137,7 @@ _IO_wstr_overflow (fp, c)
807 _IO_wint_t
808 -_IO_wstr_underflow (fp)
809 - _IO_FILE *fp;
810 +_IO_wstr_underflow (_IO_FILE *fp)
811 {
812 if (fp->_wide_data->_IO_write_ptr > fp->_wide_data->_IO_read_end)
813 fp->_wide_data->_IO_read_end = fp->_wide_data->_IO_write_ptr;
814 @@ -162,8 +156,7 @@ _IO_wstr_underflow (fp)
816 /* The size of the valid part of the buffer. */
817 _IO_ssize_t
818 -_IO_wstr_count (fp)
819 - _IO_FILE *fp;
820 +_IO_wstr_count (_IO_FILE *fp)
821 {
822 struct _IO_wide_data *wd = fp->_wide_data;
824 @@ -244,11 +237,7 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
827 _IO_off64_t
828 -_IO_wstr_seekoff (fp, offset, dir, mode)
829 - _IO_FILE *fp;
830 - _IO_off64_t offset;
831 - int dir;
832 - int mode;
833 +_IO_wstr_seekoff (_IO_FILE *fp, _IO_off64_t offset, int dir, int mode)
834 {
835 _IO_off64_t new_pos;
837 @@ -326,9 +315,7 @@ _IO_wstr_seekoff (fp, offset, dir, mode)
838 }
840 _IO_wint_t
841 -_IO_wstr_pbackfail (fp, c)
842 - _IO_FILE *fp;
843 - _IO_wint_t c;
844 +_IO_wstr_pbackfail (_IO_FILE *fp, _IO_wint_t c)
845 {
846 if ((fp->_flags & _IO_NO_WRITES) && c != WEOF)
847 return WEOF;
848 @@ -336,9 +323,7 @@ _IO_wstr_pbackfail (fp, c)
849 }
851 void
852 -_IO_wstr_finish (fp, dummy)
853 - _IO_FILE *fp;
854 - int dummy;
855 +_IO_wstr_finish (_IO_FILE *fp, int dummy)
856 {
857 if (fp->_wide_data->_IO_buf_base && !(fp->_flags2 & _IO_FLAGS2_USER_WBUF))
858 (((_IO_strfile *) fp)->_s._free_buffer) (fp->_wide_data->_IO_buf_base);
859 diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
860 index 06fca12094..c8da20b813 100644
861 --- a/locale/programs/localedef.c
862 +++ b/locale/programs/localedef.c
863 @@ -504,9 +504,7 @@ construct_output_path (char *path)
864 names. Normalization allows the user to use any of the common
865 names. */
866 static const char *
867 -normalize_codeset (codeset, name_len)
868 - const char *codeset;
869 - size_t name_len;
870 +normalize_codeset (const char *codeset, size_t name_len)
871 {
872 int len = 0;
873 int only_digit = 1;
874 diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c
875 index 49f7f1b3cf..345f9b70e2 100644
876 --- a/locale/programs/locarchive.c
877 +++ b/locale/programs/locarchive.c
878 @@ -1127,11 +1127,8 @@ add_locale (struct locarhandle *ah,
879 of the files if necessary. Add all the names, possibly overwriting
880 old files. */
881 int
882 -add_locale_to_archive (ah, name, data, replace)
883 - struct locarhandle *ah;
884 - const char *name;
885 - locale_data_t data;
886 - bool replace;
887 +add_locale_to_archive (struct locarhandle *ah, const char *name,
888 + locale_data_t data, bool replace)
889 {
890 char *normalized_name = NULL;
891 uint32_t locrec_offset;
892 @@ -1329,10 +1326,7 @@ add_locale_to_archive (ah, name, data, replace)
895 int
896 -add_locales_to_archive (nlist, list, replace)
897 - size_t nlist;
898 - char *list[];
899 - bool replace;
900 +add_locales_to_archive (size_t nlist, char *list[], bool replace)
901 {
902 struct locarhandle ah;
903 int result = 0;
904 @@ -1529,9 +1523,7 @@ add_locales_to_archive (nlist, list, replace)
907 int
908 -delete_locales_from_archive (nlist, list)
909 - size_t nlist;
910 - char *list[];
911 +delete_locales_from_archive (size_t nlist, char *list[])
912 {
913 struct locarhandle ah;
914 struct locarhead *head;
915 diff --git a/malloc/malloc.c b/malloc/malloc.c
916 index 0eca9ce0e2..9371b5a224 100644
917 --- a/malloc/malloc.c
918 +++ b/malloc/malloc.c
919 @@ -4667,7 +4667,7 @@ int_mallinfo (mstate av, struct mallinfo *m)
922 struct mallinfo
923 -__libc_mallinfo ()
924 +__libc_mallinfo (void)
925 {
926 struct mallinfo m;
927 mstate ar_ptr;
928 diff --git a/math/gen-auto-libm-tests.c b/math/gen-auto-libm-tests.c
929 index 465f7c602c..03ec6c4987 100644
930 --- a/math/gen-auto-libm-tests.c
931 +++ b/math/gen-auto-libm-tests.c
932 @@ -675,7 +675,7 @@ generic_value_copy (generic_value *dest, const generic_value *src)
933 /* Initialize data for floating-point formats. */
935 static void
936 -init_fp_formats ()
937 +init_fp_formats (void)
938 {
939 int global_max_exp = 0, global_min_subnorm_exp = 0;
940 for (fp_format f = fp_first_format; f < fp_num_formats; f++)
941 diff --git a/misc/tsearch.c b/misc/tsearch.c
942 index 869dc9bec7..5b9276c9f2 100644
943 --- a/misc/tsearch.c
944 +++ b/misc/tsearch.c
945 @@ -301,10 +301,7 @@ weak_alias (__tsearch, tsearch)
946 KEY is the key to be located, ROOTP is the address of tree root,
947 COMPAR the ordering function. */
948 void *
949 -__tfind (key, vrootp, compar)
950 - const void *key;
951 - void *const *vrootp;
952 - __compar_fn_t compar;
953 +__tfind (const void *key, void *const *vrootp, __compar_fn_t compar)
954 {
955 node *rootp = (node *) vrootp;
957 diff --git a/nptl/pthread_attr_destroy.c b/nptl/pthread_attr_destroy.c
958 index 72ee19eca9..f2701c8bb3 100644
959 --- a/nptl/pthread_attr_destroy.c
960 +++ b/nptl/pthread_attr_destroy.c
961 @@ -24,8 +24,7 @@
962 #include <shlib-compat.h>
964 int
965 -__pthread_attr_destroy (attr)
966 - pthread_attr_t *attr;
967 +__pthread_attr_destroy (pthread_attr_t *attr)
968 {
969 struct pthread_attr *iattr;
971 diff --git a/nptl/pthread_attr_getdetachstate.c b/nptl/pthread_attr_getdetachstate.c
972 index 92d683dc5c..8cc78785de 100644
973 --- a/nptl/pthread_attr_getdetachstate.c
974 +++ b/nptl/pthread_attr_getdetachstate.c
975 @@ -21,9 +21,7 @@
978 int
979 -__pthread_attr_getdetachstate (attr, detachstate)
980 - const pthread_attr_t *attr;
981 - int *detachstate;
982 +__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate)
983 {
984 struct pthread_attr *iattr;
986 diff --git a/nptl/pthread_attr_getguardsize.c b/nptl/pthread_attr_getguardsize.c
987 index 83cb8016ea..b05b36ecfb 100644
988 --- a/nptl/pthread_attr_getguardsize.c
989 +++ b/nptl/pthread_attr_getguardsize.c
990 @@ -21,9 +21,7 @@
993 int
994 -pthread_attr_getguardsize (attr, guardsize)
995 - const pthread_attr_t *attr;
996 - size_t *guardsize;
997 +pthread_attr_getguardsize (const pthread_attr_t *attr, size_t *guardsize)
998 {
999 struct pthread_attr *iattr;
1001 diff --git a/nptl/pthread_attr_getinheritsched.c b/nptl/pthread_attr_getinheritsched.c
1002 index 9a0e8e6b8f..ed3435e020 100644
1003 --- a/nptl/pthread_attr_getinheritsched.c
1004 +++ b/nptl/pthread_attr_getinheritsched.c
1005 @@ -21,9 +21,7 @@
1008 int
1009 -__pthread_attr_getinheritsched (attr, inherit)
1010 - const pthread_attr_t *attr;
1011 - int *inherit;
1012 +__pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inherit)
1013 {
1014 struct pthread_attr *iattr;
1016 diff --git a/nptl/pthread_attr_getschedparam.c b/nptl/pthread_attr_getschedparam.c
1017 index 3f38bd711d..3c9dffa6d3 100644
1018 --- a/nptl/pthread_attr_getschedparam.c
1019 +++ b/nptl/pthread_attr_getschedparam.c
1020 @@ -22,9 +22,8 @@
1023 int
1024 -__pthread_attr_getschedparam (attr, param)
1025 - const pthread_attr_t *attr;
1026 - struct sched_param *param;
1027 +__pthread_attr_getschedparam (const pthread_attr_t *attr,
1028 + struct sched_param *param)
1029 {
1030 struct pthread_attr *iattr;
1032 diff --git a/nptl/pthread_attr_getschedpolicy.c b/nptl/pthread_attr_getschedpolicy.c
1033 index 19996a68de..10728c364d 100644
1034 --- a/nptl/pthread_attr_getschedpolicy.c
1035 +++ b/nptl/pthread_attr_getschedpolicy.c
1036 @@ -21,9 +21,7 @@
1039 int
1040 -__pthread_attr_getschedpolicy (attr, policy)
1041 - const pthread_attr_t *attr;
1042 - int *policy;
1043 +__pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy)
1044 {
1045 struct pthread_attr *iattr;
1047 diff --git a/nptl/pthread_attr_getscope.c b/nptl/pthread_attr_getscope.c
1048 index e72247a99a..e704161caf 100644
1049 --- a/nptl/pthread_attr_getscope.c
1050 +++ b/nptl/pthread_attr_getscope.c
1051 @@ -21,9 +21,7 @@
1054 int
1055 -__pthread_attr_getscope (attr, scope)
1056 - const pthread_attr_t *attr;
1057 - int *scope;
1058 +__pthread_attr_getscope (const pthread_attr_t *attr, int *scope)
1059 {
1060 struct pthread_attr *iattr;
1062 diff --git a/nptl/pthread_attr_getstack.c b/nptl/pthread_attr_getstack.c
1063 index 96c15c58ad..4cedcc5fd2 100644
1064 --- a/nptl/pthread_attr_getstack.c
1065 +++ b/nptl/pthread_attr_getstack.c
1066 @@ -21,10 +21,8 @@
1069 int
1070 -__pthread_attr_getstack (attr, stackaddr, stacksize)
1071 - const pthread_attr_t *attr;
1072 - void **stackaddr;
1073 - size_t *stacksize;
1074 +__pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr,
1075 + size_t *stacksize)
1076 {
1077 struct pthread_attr *iattr;
1079 diff --git a/nptl/pthread_attr_getstackaddr.c b/nptl/pthread_attr_getstackaddr.c
1080 index 9c85cec202..bceab68b58 100644
1081 --- a/nptl/pthread_attr_getstackaddr.c
1082 +++ b/nptl/pthread_attr_getstackaddr.c
1083 @@ -22,9 +22,7 @@
1086 int
1087 -__pthread_attr_getstackaddr (attr, stackaddr)
1088 - const pthread_attr_t *attr;
1089 - void **stackaddr;
1090 +__pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr)
1091 {
1092 struct pthread_attr *iattr;
1094 diff --git a/nptl/pthread_attr_getstacksize.c b/nptl/pthread_attr_getstacksize.c
1095 index ab18c27ae0..b48e1d06af 100644
1096 --- a/nptl/pthread_attr_getstacksize.c
1097 +++ b/nptl/pthread_attr_getstacksize.c
1098 @@ -21,9 +21,7 @@
1101 int
1102 -__pthread_attr_getstacksize (attr, stacksize)
1103 - const pthread_attr_t *attr;
1104 - size_t *stacksize;
1105 +__pthread_attr_getstacksize (const pthread_attr_t *attr, size_t *stacksize)
1106 {
1107 struct pthread_attr *iattr;
1109 diff --git a/nptl/pthread_attr_init.c b/nptl/pthread_attr_init.c
1110 index 89bec2959b..3780b625c3 100644
1111 --- a/nptl/pthread_attr_init.c
1112 +++ b/nptl/pthread_attr_init.c
1113 @@ -30,8 +30,7 @@ int __attr_list_lock = LLL_LOCK_INITIALIZER;
1116 int
1117 -__pthread_attr_init_2_1 (attr)
1118 - pthread_attr_t *attr;
1119 +__pthread_attr_init_2_1 (pthread_attr_t *attr)
1120 {
1121 struct pthread_attr *iattr;
1123 @@ -54,8 +53,7 @@ versioned_symbol (libpthread, __pthread_attr_init_2_1, pthread_attr_init,
1125 #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
1126 int
1127 -__pthread_attr_init_2_0 (attr)
1128 - pthread_attr_t *attr;
1129 +__pthread_attr_init_2_0 (pthread_attr_t *attr)
1130 {
1131 /* This code is specific to the old LinuxThread code which has a too
1132 small pthread_attr_t definition. The struct looked like
1133 diff --git a/nptl/pthread_attr_setdetachstate.c b/nptl/pthread_attr_setdetachstate.c
1134 index ad0d43135a..c4e085b723 100644
1135 --- a/nptl/pthread_attr_setdetachstate.c
1136 +++ b/nptl/pthread_attr_setdetachstate.c
1137 @@ -22,9 +22,7 @@
1140 int
1141 -__pthread_attr_setdetachstate (attr, detachstate)
1142 - pthread_attr_t *attr;
1143 - int detachstate;
1144 +__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate)
1145 {
1146 struct pthread_attr *iattr;
1148 diff --git a/nptl/pthread_attr_setguardsize.c b/nptl/pthread_attr_setguardsize.c
1149 index 86df9715d8..9a7a984bd9 100644
1150 --- a/nptl/pthread_attr_setguardsize.c
1151 +++ b/nptl/pthread_attr_setguardsize.c
1152 @@ -21,9 +21,7 @@
1155 int
1156 -pthread_attr_setguardsize (attr, guardsize)
1157 - pthread_attr_t *attr;
1158 - size_t guardsize;
1159 +pthread_attr_setguardsize (pthread_attr_t *attr, size_t guardsize)
1160 {
1161 struct pthread_attr *iattr;
1163 diff --git a/nptl/pthread_attr_setinheritsched.c b/nptl/pthread_attr_setinheritsched.c
1164 index 477072d8de..c66a4e3d38 100644
1165 --- a/nptl/pthread_attr_setinheritsched.c
1166 +++ b/nptl/pthread_attr_setinheritsched.c
1167 @@ -22,9 +22,7 @@
1170 int
1171 -__pthread_attr_setinheritsched (attr, inherit)
1172 - pthread_attr_t *attr;
1173 - int inherit;
1174 +__pthread_attr_setinheritsched (pthread_attr_t *attr, int inherit)
1175 {
1176 struct pthread_attr *iattr;
1178 diff --git a/nptl/pthread_attr_setschedparam.c b/nptl/pthread_attr_setschedparam.c
1179 index f6347a78c8..d6ac0fffb2 100644
1180 --- a/nptl/pthread_attr_setschedparam.c
1181 +++ b/nptl/pthread_attr_setschedparam.c
1182 @@ -23,9 +23,8 @@
1185 int
1186 -__pthread_attr_setschedparam (attr, param)
1187 - pthread_attr_t *attr;
1188 - const struct sched_param *param;
1189 +__pthread_attr_setschedparam (pthread_attr_t *attr,
1190 + const struct sched_param *param)
1191 {
1192 assert (sizeof (*attr) >= sizeof (struct pthread_attr));
1193 struct pthread_attr *iattr = (struct pthread_attr *) attr;
1194 diff --git a/nptl/pthread_attr_setschedpolicy.c b/nptl/pthread_attr_setschedpolicy.c
1195 index 70f439590f..8bc9ed20fb 100644
1196 --- a/nptl/pthread_attr_setschedpolicy.c
1197 +++ b/nptl/pthread_attr_setschedpolicy.c
1198 @@ -22,9 +22,7 @@
1201 int
1202 -__pthread_attr_setschedpolicy (attr, policy)
1203 - pthread_attr_t *attr;
1204 - int policy;
1205 +__pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy)
1206 {
1207 struct pthread_attr *iattr;
1209 diff --git a/nptl/pthread_attr_setscope.c b/nptl/pthread_attr_setscope.c
1210 index 8f510bfec2..7559d105db 100644
1211 --- a/nptl/pthread_attr_setscope.c
1212 +++ b/nptl/pthread_attr_setscope.c
1213 @@ -22,9 +22,7 @@
1216 int
1217 -__pthread_attr_setscope (attr, scope)
1218 - pthread_attr_t *attr;
1219 - int scope;
1220 +__pthread_attr_setscope (pthread_attr_t *attr, int scope)
1221 {
1222 struct pthread_attr *iattr;
1224 diff --git a/nptl/pthread_attr_setstack.c b/nptl/pthread_attr_setstack.c
1225 index 6898f72540..c44c383aa7 100644
1226 --- a/nptl/pthread_attr_setstack.c
1227 +++ b/nptl/pthread_attr_setstack.c
1228 @@ -28,10 +28,8 @@
1231 int
1232 -__pthread_attr_setstack (attr, stackaddr, stacksize)
1233 - pthread_attr_t *attr;
1234 - void *stackaddr;
1235 - size_t stacksize;
1236 +__pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr,
1237 + size_t stacksize)
1238 {
1239 struct pthread_attr *iattr;
1241 diff --git a/nptl/pthread_attr_setstackaddr.c b/nptl/pthread_attr_setstackaddr.c
1242 index 2c028a54fa..ab0d7d2a33 100644
1243 --- a/nptl/pthread_attr_setstackaddr.c
1244 +++ b/nptl/pthread_attr_setstackaddr.c
1245 @@ -22,9 +22,7 @@
1248 int
1249 -__pthread_attr_setstackaddr (attr, stackaddr)
1250 - pthread_attr_t *attr;
1251 - void *stackaddr;
1252 +__pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr)
1253 {
1254 struct pthread_attr *iattr;
1256 diff --git a/nptl/pthread_attr_setstacksize.c b/nptl/pthread_attr_setstacksize.c
1257 index a0cda0cbce..d3d109a232 100644
1258 --- a/nptl/pthread_attr_setstacksize.c
1259 +++ b/nptl/pthread_attr_setstacksize.c
1260 @@ -27,9 +27,7 @@
1263 int
1264 -__pthread_attr_setstacksize (attr, stacksize)
1265 - pthread_attr_t *attr;
1266 - size_t stacksize;
1267 +__pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize)
1268 {
1269 struct pthread_attr *iattr;
1271 diff --git a/nptl/pthread_condattr_setclock.c b/nptl/pthread_condattr_setclock.c
1272 index 0748d78d05..5300844d06 100644
1273 --- a/nptl/pthread_condattr_setclock.c
1274 +++ b/nptl/pthread_condattr_setclock.c
1275 @@ -25,9 +25,7 @@
1278 int
1279 -pthread_condattr_setclock (attr, clock_id)
1280 - pthread_condattr_t *attr;
1281 - clockid_t clock_id;
1282 +pthread_condattr_setclock (pthread_condattr_t *attr, clockid_t clock_id)
1283 {
1284 /* Only a few clocks are allowed. */
1285 if (clock_id != CLOCK_MONOTONIC && clock_id != CLOCK_REALTIME)
1286 diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
1287 index d10f4ea800..790f46db3f 100644
1288 --- a/nptl/pthread_create.c
1289 +++ b/nptl/pthread_create.c
1290 @@ -80,8 +80,7 @@ static int create_thread (struct pthread *pd, const struct pthread_attr *attr,
1292 struct pthread *
1293 internal_function
1294 -__find_in_stack_list (pd)
1295 - struct pthread *pd;
1296 +__find_in_stack_list (struct pthread *pd)
1297 {
1298 list_t *entry;
1299 struct pthread *result = NULL;
1300 diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
1301 index 52a4602730..5ebff5cbbc 100644
1302 --- a/nptl/pthread_getattr_np.c
1303 +++ b/nptl/pthread_getattr_np.c
1304 @@ -30,9 +30,7 @@
1307 int
1308 -pthread_getattr_np (thread_id, attr)
1309 - pthread_t thread_id;
1310 - pthread_attr_t *attr;
1311 +pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
1312 {
1313 struct pthread *thread = (struct pthread *) thread_id;
1314 struct pthread_attr *iattr = (struct pthread_attr *) attr;
1315 diff --git a/nptl/pthread_mutex_cond_lock.c b/nptl/pthread_mutex_cond_lock.c
1316 index 7b6fbc18aa..2ac421fd63 100644
1317 --- a/nptl/pthread_mutex_cond_lock.c
1318 +++ b/nptl/pthread_mutex_cond_lock.c
1319 @@ -14,7 +14,7 @@
1320 #define LLL_ROBUST_MUTEX_LOCK(mutex, id) \
1321 lll_robust_cond_lock ((mutex)->__data.__lock, id, \
1322 PTHREAD_ROBUST_MUTEX_PSHARED (mutex))
1323 -#define __pthread_mutex_lock __pthread_mutex_cond_lock
1324 +#define __pthread_mutex_lock internal_function __pthread_mutex_cond_lock
1325 #define __pthread_mutex_lock_full __pthread_mutex_cond_lock_full
1326 #define NO_INCR
1328 diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c
1329 index d71cfef0f7..45c159bad3 100644
1330 --- a/nptl/pthread_mutex_init.c
1331 +++ b/nptl/pthread_mutex_init.c
1332 @@ -55,9 +55,8 @@ prio_inherit_missing (void)
1333 }
1335 int
1336 -__pthread_mutex_init (mutex, mutexattr)
1337 - pthread_mutex_t *mutex;
1338 - const pthread_mutexattr_t *mutexattr;
1339 +__pthread_mutex_init (pthread_mutex_t *mutex,
1340 + const pthread_mutexattr_t *mutexattr)
1341 {
1342 const struct pthread_mutexattr *imutexattr;
1344 diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c
1345 index 9a3b46624d..493fe43778 100644
1346 --- a/nptl/pthread_mutex_lock.c
1347 +++ b/nptl/pthread_mutex_lock.c
1348 @@ -60,8 +60,7 @@ static int __pthread_mutex_lock_full (pthread_mutex_t *mutex)
1349 __attribute_noinline__;
1351 int
1352 -__pthread_mutex_lock (mutex)
1353 - pthread_mutex_t *mutex;
1354 +__pthread_mutex_lock (pthread_mutex_t *mutex)
1355 {
1356 assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
1358 @@ -521,8 +520,8 @@ hidden_def (__pthread_mutex_lock)
1360 #ifdef NO_INCR
1361 void
1362 -__pthread_mutex_cond_lock_adjust (mutex)
1363 - pthread_mutex_t *mutex;
1364 +internal_function
1365 +__pthread_mutex_cond_lock_adjust (pthread_mutex_t *mutex)
1366 {
1367 assert ((mutex->__data.__kind & PTHREAD_MUTEX_PRIO_INHERIT_NP) != 0);
1368 assert ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) == 0);
1369 diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c
1370 index f0fb03e90b..370a232773 100644
1371 --- a/nptl/pthread_mutex_timedlock.c
1372 +++ b/nptl/pthread_mutex_timedlock.c
1373 @@ -41,9 +41,8 @@
1374 #endif
1376 int
1377 -pthread_mutex_timedlock (mutex, abstime)
1378 - pthread_mutex_t *mutex;
1379 - const struct timespec *abstime;
1380 +pthread_mutex_timedlock (pthread_mutex_t *mutex,
1381 + const struct timespec *abstime)
1382 {
1383 int oldval;
1384 pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
1385 diff --git a/nptl/pthread_mutex_trylock.c b/nptl/pthread_mutex_trylock.c
1386 index 33df384bd0..17ec2302ec 100644
1387 --- a/nptl/pthread_mutex_trylock.c
1388 +++ b/nptl/pthread_mutex_trylock.c
1389 @@ -31,8 +31,7 @@
1390 #endif
1392 int
1393 -__pthread_mutex_trylock (mutex)
1394 - pthread_mutex_t *mutex;
1395 +__pthread_mutex_trylock (pthread_mutex_t *mutex)
1396 {
1397 int oldval;
1398 pid_t id = THREAD_GETMEM (THREAD_SELF, tid);
1399 diff --git a/nptl/pthread_mutex_unlock.c b/nptl/pthread_mutex_unlock.c
1400 index 9e864c1832..c078f7ebe3 100644
1401 --- a/nptl/pthread_mutex_unlock.c
1402 +++ b/nptl/pthread_mutex_unlock.c
1403 @@ -34,9 +34,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
1405 int
1406 internal_function attribute_hidden
1407 -__pthread_mutex_unlock_usercnt (mutex, decr)
1408 - pthread_mutex_t *mutex;
1409 - int decr;
1410 +__pthread_mutex_unlock_usercnt (pthread_mutex_t *mutex, int decr)
1411 {
1412 int type = PTHREAD_MUTEX_TYPE_ELISION (mutex);
1413 if (__builtin_expect (type &
1414 @@ -309,8 +307,7 @@ __pthread_mutex_unlock_full (pthread_mutex_t *mutex, int decr)
1417 int
1418 -__pthread_mutex_unlock (mutex)
1419 - pthread_mutex_t *mutex;
1420 +__pthread_mutex_unlock (pthread_mutex_t *mutex)
1421 {
1422 return __pthread_mutex_unlock_usercnt (mutex, 1);
1423 }
1424 diff --git a/nptl_db/td_ta_clear_event.c b/nptl_db/td_ta_clear_event.c
1425 index 368c21eca8..9279837dd9 100644
1426 --- a/nptl_db/td_ta_clear_event.c
1427 +++ b/nptl_db/td_ta_clear_event.c
1428 @@ -22,9 +22,7 @@
1431 td_err_e
1432 -td_ta_clear_event (ta_arg, event)
1433 - const td_thragent_t *ta_arg;
1434 - td_thr_events_t *event;
1435 +td_ta_clear_event (const td_thragent_t *ta_arg, td_thr_events_t *event)
1436 {
1437 td_thragent_t *const ta = (td_thragent_t *) ta_arg;
1438 td_err_e err;
1439 diff --git a/nptl_db/td_ta_set_event.c b/nptl_db/td_ta_set_event.c
1440 index 132363d831..157e022b83 100644
1441 --- a/nptl_db/td_ta_set_event.c
1442 +++ b/nptl_db/td_ta_set_event.c
1443 @@ -22,9 +22,7 @@
1446 td_err_e
1447 -td_ta_set_event (ta_arg, event)
1448 - const td_thragent_t *ta_arg;
1449 - td_thr_events_t *event;
1450 +td_ta_set_event (const td_thragent_t *ta_arg, td_thr_events_t *event)
1451 {
1452 td_thragent_t *const ta = (td_thragent_t *) ta_arg;
1453 td_err_e err;
1454 diff --git a/nptl_db/td_thr_clear_event.c b/nptl_db/td_thr_clear_event.c
1455 index 4f81ede8ed..1cd732d4f1 100644
1456 --- a/nptl_db/td_thr_clear_event.c
1457 +++ b/nptl_db/td_thr_clear_event.c
1458 @@ -24,9 +24,7 @@
1461 td_err_e
1462 -td_thr_clear_event (th, event)
1463 - const td_thrhandle_t *th;
1464 - td_thr_events_t *event;
1465 +td_thr_clear_event (const td_thrhandle_t *th, td_thr_events_t *event)
1466 {
1467 td_err_e err;
1468 psaddr_t eventmask;
1469 diff --git a/nptl_db/td_thr_event_enable.c b/nptl_db/td_thr_event_enable.c
1470 index dba7b3886b..3ee9e1dabe 100644
1471 --- a/nptl_db/td_thr_event_enable.c
1472 +++ b/nptl_db/td_thr_event_enable.c
1473 @@ -21,9 +21,7 @@
1476 td_err_e
1477 -td_thr_event_enable (th, onoff)
1478 - const td_thrhandle_t *th;
1479 - int onoff;
1480 +td_thr_event_enable (const td_thrhandle_t *th, int onoff)
1481 {
1482 LOG ("td_thr_event_enable");
1484 diff --git a/nptl_db/td_thr_set_event.c b/nptl_db/td_thr_set_event.c
1485 index bf5f6b7450..64ef046727 100644
1486 --- a/nptl_db/td_thr_set_event.c
1487 +++ b/nptl_db/td_thr_set_event.c
1488 @@ -24,9 +24,7 @@
1491 td_err_e
1492 -td_thr_set_event (th, event)
1493 - const td_thrhandle_t *th;
1494 - td_thr_events_t *event;
1495 +td_thr_set_event (const td_thrhandle_t *th, td_thr_events_t *event)
1496 {
1497 td_err_e err;
1498 psaddr_t eventmask;
1499 diff --git a/nss/makedb.c b/nss/makedb.c
1500 index c7b466ab43..e53a3ca6ba 100644
1501 --- a/nss/makedb.c
1502 +++ b/nss/makedb.c
1503 @@ -415,11 +415,7 @@ valstr_compare (const void *p1, const void *p2)
1506 static int
1507 -process_input (input, inname, to_lowercase, be_quiet)
1508 - FILE *input;
1509 - const char *inname;
1510 - int to_lowercase;
1511 - int be_quiet;
1512 +process_input (FILE *input, const char *inname, int to_lowercase, int be_quiet)
1513 {
1514 char *line;
1515 size_t linelen;
1516 diff --git a/posix/fnmatch.c b/posix/fnmatch.c
1517 index fd85efa2c7..16d3555a43 100644
1518 --- a/posix/fnmatch.c
1519 +++ b/posix/fnmatch.c
1520 @@ -166,9 +166,7 @@ static int posixly_correct;
1522 # if !defined HAVE___STRCHRNUL && !defined _LIBC
1523 static char *
1524 -__strchrnul (s, c)
1525 - const char *s;
1526 - int c;
1527 +__strchrnul (const char *s, int c)
1528 {
1529 char *result = strchr (s, c);
1530 if (result == NULL)
1531 @@ -179,9 +177,7 @@ __strchrnul (s, c)
1533 # if HANDLE_MULTIBYTE && !defined HAVE___STRCHRNUL && !defined _LIBC
1534 static wchar_t *
1535 -__wcschrnul (s, c)
1536 - const wchar_t *s;
1537 - wint_t c;
1538 +__wcschrnul (const wchar_t *s, wint_t c)
1539 {
1540 wchar_t *result = wcschr (s, c);
1541 if (result == NULL)
1542 @@ -327,10 +323,7 @@ is_char_class (const wchar_t *wcs)
1545 int
1546 -fnmatch (pattern, string, flags)
1547 - const char *pattern;
1548 - const char *string;
1549 - int flags;
1550 +fnmatch (const char *pattern, const char *string, int flags)
1551 {
1552 # if HANDLE_MULTIBYTE
1553 if (__builtin_expect (MB_CUR_MAX, 1) != 1)
1554 diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
1555 index f46c9dfedb..8d4049d6dc 100644
1556 --- a/posix/fnmatch_loop.c
1557 +++ b/posix/fnmatch_loop.c
1558 @@ -38,14 +38,8 @@ static const CHAR *END (const CHAR *patternp) internal_function;
1560 static int
1561 internal_function
1562 -FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
1563 - const CHAR *pattern;
1564 - const CHAR *string;
1565 - const CHAR *string_end;
1566 - int no_leading_period;
1567 - int flags;
1568 - struct STRUCT *ends;
1569 - size_t alloca_used;
1570 +FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
1571 + int no_leading_period, int flags, struct STRUCT *ends, size_t alloca_used)
1572 {
1573 const CHAR *p = pattern, *n = string;
1574 UCHAR c;
1575 diff --git a/posix/glob.c b/posix/glob.c
1576 index d65e55dcd6..d178cf0206 100644
1577 --- a/posix/glob.c
1578 +++ b/posix/glob.c
1579 @@ -1267,8 +1267,7 @@ libc_hidden_def (glob)
1581 /* Free storage allocated in PGLOB by a previous `glob' call. */
1582 void
1583 -globfree (pglob)
1584 - glob_t *pglob;
1585 +globfree (glob_t *pglob)
1586 {
1587 if (pglob->gl_pathv != NULL)
1588 {
1589 @@ -1363,9 +1362,7 @@ prefix_array (const char *dirname, char **array, size_t n)
1590 /* We must not compile this function twice. */
1591 #if !defined _LIBC || !defined NO_GLOB_PATTERN_P
1592 int
1593 -__glob_pattern_type (pattern, quote)
1594 - const char *pattern;
1595 - int quote;
1596 +__glob_pattern_type (const char *pattern, int quote)
1597 {
1598 const char *p;
1599 int ret = 0;
1600 @@ -1402,9 +1399,7 @@ __glob_pattern_type (pattern, quote)
1601 /* Return nonzero if PATTERN contains any metacharacters.
1602 Metacharacters can be quoted with backslashes if QUOTE is nonzero. */
1603 int
1604 -__glob_pattern_p (pattern, quote)
1605 - const char *pattern;
1606 - int quote;
1607 +__glob_pattern_p (const char *pattern, int quote)
1608 {
1609 return __glob_pattern_type (pattern, quote) == 1;
1610 }
1611 diff --git a/posix/regcomp.c b/posix/regcomp.c
1612 index bf8aa1604c..c8e0c79219 100644
1613 --- a/posix/regcomp.c
1614 +++ b/posix/regcomp.c
1615 @@ -216,10 +216,8 @@ const size_t __re_error_msgid_idx[] attribute_hidden =
1616 are set in BUFP on entry. */
1618 const char *
1619 -re_compile_pattern (pattern, length, bufp)
1620 - const char *pattern;
1621 - size_t length;
1622 - struct re_pattern_buffer *bufp;
1623 +re_compile_pattern (const char *pattern, size_t length,
1624 + struct re_pattern_buffer *bufp)
1625 {
1626 reg_errcode_t ret;
1628 @@ -257,8 +255,7 @@ reg_syntax_t re_syntax_options;
1629 defined in regex.h. We return the old syntax. */
1631 reg_syntax_t
1632 -re_set_syntax (syntax)
1633 - reg_syntax_t syntax;
1634 +re_set_syntax (reg_syntax_t syntax)
1635 {
1636 reg_syntax_t ret = re_syntax_options;
1638 @@ -270,8 +267,7 @@ weak_alias (__re_set_syntax, re_set_syntax)
1639 #endif
1641 int
1642 -re_compile_fastmap (bufp)
1643 - struct re_pattern_buffer *bufp;
1644 +re_compile_fastmap (struct re_pattern_buffer *bufp)
1645 {
1646 re_dfa_t *dfa = (re_dfa_t *) bufp->buffer;
1647 char *fastmap = bufp->fastmap;
1648 @@ -469,10 +465,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
1649 the return codes and their meanings.) */
1651 int
1652 -regcomp (preg, pattern, cflags)
1653 - regex_t *__restrict preg;
1654 - const char *__restrict pattern;
1655 - int cflags;
1656 +regcomp (regex_t *__restrict preg, const char *__restrict pattern, int cflags)
1657 {
1658 reg_errcode_t ret;
1659 reg_syntax_t syntax = ((cflags & REG_EXTENDED) ? RE_SYNTAX_POSIX_EXTENDED
1660 @@ -531,11 +524,8 @@ weak_alias (__regcomp, regcomp)
1661 from either regcomp or regexec. We don't use PREG here. */
1663 size_t
1664 -regerror (errcode, preg, errbuf, errbuf_size)
1665 - int errcode;
1666 - const regex_t *__restrict preg;
1667 - char *__restrict errbuf;
1668 - size_t errbuf_size;
1669 +regerror (int errcode, const regex_t *__restrict preg, char *__restrict errbuf,
1670 + size_t errbuf_size)
1671 {
1672 const char *msg;
1673 size_t msg_size;
1674 @@ -639,8 +629,7 @@ free_dfa_content (re_dfa_t *dfa)
1675 /* Free dynamically allocated space used by PREG. */
1677 void
1678 -regfree (preg)
1679 - regex_t *preg;
1680 +regfree (regex_t *preg)
1681 {
1682 re_dfa_t *dfa = (re_dfa_t *) preg->buffer;
1683 if (BE (dfa != NULL, 1))
1684 diff --git a/posix/regexec.c b/posix/regexec.c
1685 index 70cd6064dd..f748a314bb 100644
1686 --- a/posix/regexec.c
1687 +++ b/posix/regexec.c
1688 @@ -219,12 +219,8 @@ static reg_errcode_t extend_buffers (re_match_context_t *mctx, int min_len)
1689 We return 0 if we find a match and REG_NOMATCH if not. */
1691 int
1692 -regexec (preg, string, nmatch, pmatch, eflags)
1693 - const regex_t *__restrict preg;
1694 - const char *__restrict string;
1695 - size_t nmatch;
1696 - regmatch_t pmatch[];
1697 - int eflags;
1698 +regexec (const regex_t *__restrict preg, const char *__restrict string,
1699 + size_t nmatch, regmatch_t pmatch[], int eflags)
1700 {
1701 reg_errcode_t err;
1702 int start, length;
1703 @@ -305,11 +301,8 @@ compat_symbol (libc, __compat_regexec, regexec, GLIBC_2_0);
1704 match was found and -2 indicates an internal error. */
1706 int
1707 -re_match (bufp, string, length, start, regs)
1708 - struct re_pattern_buffer *bufp;
1709 - const char *string;
1710 - int length, start;
1711 - struct re_registers *regs;
1712 +re_match (struct re_pattern_buffer *bufp, const char *string, int length,
1713 + int start, struct re_registers *regs)
1714 {
1715 return re_search_stub (bufp, string, length, start, 0, length, regs, 1);
1716 }
1717 @@ -318,11 +311,8 @@ weak_alias (__re_match, re_match)
1718 #endif
1720 int
1721 -re_search (bufp, string, length, start, range, regs)
1722 - struct re_pattern_buffer *bufp;
1723 - const char *string;
1724 - int length, start, range;
1725 - struct re_registers *regs;
1726 +re_search (struct re_pattern_buffer *bufp, const char *string, int length,
1727 + int start, int range, struct re_registers *regs)
1728 {
1729 return re_search_stub (bufp, string, length, start, range, length, regs, 0);
1730 }
1731 @@ -331,11 +321,9 @@ weak_alias (__re_search, re_search)
1732 #endif
1734 int
1735 -re_match_2 (bufp, string1, length1, string2, length2, start, regs, stop)
1736 - struct re_pattern_buffer *bufp;
1737 - const char *string1, *string2;
1738 - int length1, length2, start, stop;
1739 - struct re_registers *regs;
1740 +re_match_2 (struct re_pattern_buffer *bufp, const char *string1, int length1,
1741 + const char *string2, int length2, int start,
1742 + struct re_registers *regs, int stop)
1743 {
1744 return re_search_2_stub (bufp, string1, length1, string2, length2,
1745 start, 0, regs, stop, 1);
1746 @@ -345,11 +333,9 @@ weak_alias (__re_match_2, re_match_2)
1747 #endif
1749 int
1750 -re_search_2 (bufp, string1, length1, string2, length2, start, range, regs, stop)
1751 - struct re_pattern_buffer *bufp;
1752 - const char *string1, *string2;
1753 - int length1, length2, start, range, stop;
1754 - struct re_registers *regs;
1755 +re_search_2 (struct re_pattern_buffer *bufp, const char *string1, int length1,
1756 + const char *string2, int length2, int start, int range,
1757 + struct re_registers *regs, int stop)
1758 {
1759 return re_search_2_stub (bufp, string1, length1, string2, length2,
1760 start, range, regs, stop, 0);
1761 @@ -406,11 +392,10 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs,
1762 otherwise the position of the match is returned. */
1764 static int
1765 -re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
1766 - struct re_pattern_buffer *bufp;
1767 - const char *string;
1768 - int length, start, range, stop, ret_len;
1769 - struct re_registers *regs;
1770 +internal_function
1771 +re_search_stub (struct re_pattern_buffer *bufp, const char *string, int length,
1772 + int start, int range, int stop, struct re_registers *regs,
1773 + int ret_len)
1774 {
1775 reg_errcode_t result;
1776 regmatch_t *pmatch;
1777 @@ -495,10 +480,9 @@ re_search_stub (bufp, string, length, start, range, stop, regs, ret_len)
1778 }
1780 static unsigned
1781 -re_copy_regs (regs, pmatch, nregs, regs_allocated)
1782 - struct re_registers *regs;
1783 - regmatch_t *pmatch;
1784 - int nregs, regs_allocated;
1785 +internal_function
1786 +re_copy_regs (struct re_registers *regs, regmatch_t *pmatch, int nregs,
1787 + int regs_allocated)
1788 {
1789 int rval = REGS_REALLOCATE;
1790 int i;
1791 @@ -575,11 +559,8 @@ re_copy_regs (regs, pmatch, nregs, regs_allocated)
1792 freeing the old data. */
1794 void
1795 -re_set_registers (bufp, regs, num_regs, starts, ends)
1796 - struct re_pattern_buffer *bufp;
1797 - struct re_registers *regs;
1798 - unsigned num_regs;
1799 - regoff_t *starts, *ends;
1800 +re_set_registers (struct re_pattern_buffer *bufp, struct re_registers *regs,
1801 + unsigned num_regs, regoff_t *starts, regoff_t *ends)
1802 {
1803 if (num_regs)
1804 {
1805 @@ -953,9 +934,8 @@ re_search_internal (preg, string, length, start, range, stop, nmatch, pmatch,
1806 }
1808 static reg_errcode_t
1809 -__attribute_warn_unused_result__
1810 -prune_impossible_nodes (mctx)
1811 - re_match_context_t *mctx;
1812 +internal_function __attribute_warn_unused_result__
1813 +prune_impossible_nodes (re_match_context_t *mctx)
1814 {
1815 const re_dfa_t *const dfa = mctx->dfa;
1816 int halt_node, match_last;
1817 diff --git a/resolv/inet_net_pton.c b/resolv/inet_net_pton.c
1818 index 14916f83f8..75a8515c15 100644
1819 --- a/resolv/inet_net_pton.c
1820 +++ b/resolv/inet_net_pton.c
1821 @@ -54,11 +54,7 @@ static int inet_net_pton_ipv4 (const char *src, u_char *dst,
1822 * Paul Vixie (ISC), June 1996
1823 */
1824 int
1825 -inet_net_pton(af, src, dst, size)
1826 - int af;
1827 - const char *src;
1828 - void *dst;
1829 - size_t size;
1830 +inet_net_pton (int af, const char *src, void *dst, size_t size)
1831 {
1832 switch (af) {
1833 case AF_INET:
1834 @@ -86,10 +82,7 @@ inet_net_pton(af, src, dst, size)
1835 * Paul Vixie (ISC), June 1996
1836 */
1837 static int
1838 -inet_net_pton_ipv4(src, dst, size)
1839 - const char *src;
1840 - u_char *dst;
1841 - size_t size;
1842 +inet_net_pton_ipv4 (const char *src, u_char *dst, size_t size)
1843 {
1844 static const char xdigits[] = "0123456789abcdef";
1845 int n, ch, tmp, dirty, bits;
1846 diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
1847 index da8e4df1ce..f07b0f368b 100644
1848 --- a/stdlib/strtod_l.c
1849 +++ b/stdlib/strtod_l.c
1850 @@ -487,11 +487,8 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize,
1851 return 0.0. If the number is too big to be represented, set `errno' to
1852 ERANGE and return HUGE_VAL with the appropriate sign. */
1853 FLOAT
1854 -____STRTOF_INTERNAL (nptr, endptr, group, loc)
1855 - const STRING_TYPE *nptr;
1856 - STRING_TYPE **endptr;
1857 - int group;
1858 - __locale_t loc;
1859 +____STRTOF_INTERNAL (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group,
1860 + __locale_t loc)
1861 {
1862 int negative; /* The sign of the number. */
1863 MPN_VAR (num); /* MP representation of the number. */
1864 diff --git a/sysdeps/pthread/aio_cancel.c b/sysdeps/pthread/aio_cancel.c
1865 index c1e12e4d0f..0106728cd6 100644
1866 --- a/sysdeps/pthread/aio_cancel.c
1867 +++ b/sysdeps/pthread/aio_cancel.c
1868 @@ -38,9 +38,7 @@
1871 int
1872 -aio_cancel (fildes, aiocbp)
1873 - int fildes;
1874 - struct aiocb *aiocbp;
1875 +aio_cancel (int fildes, struct aiocb *aiocbp)
1876 {
1877 struct requestlist *req = NULL;
1878 int result = AIO_ALLDONE;
1879 diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c
1880 index bfca6627f1..40726a8341 100644
1881 --- a/sysdeps/pthread/aio_suspend.c
1882 +++ b/sysdeps/pthread/aio_suspend.c
1883 @@ -105,10 +105,8 @@ do_aio_misc_wait (unsigned int *cntr, const struct timespec *timeout)
1884 #endif
1886 int
1887 -aio_suspend (list, nent, timeout)
1888 - const struct aiocb *const list[];
1889 - int nent;
1890 - const struct timespec *timeout;
1891 +aio_suspend (const struct aiocb *const list[], int nent,
1892 + const struct timespec *timeout)
1893 {
1894 if (__glibc_unlikely (nent < 0))
1895 {
1896 diff --git a/sysdeps/pthread/timer_delete.c b/sysdeps/pthread/timer_delete.c
1897 index ef0133f4ec..49f4c5bc70 100644
1898 --- a/sysdeps/pthread/timer_delete.c
1899 +++ b/sysdeps/pthread/timer_delete.c
1900 @@ -26,8 +26,7 @@
1902 /* Delete timer TIMERID. */
1903 int
1904 -timer_delete (timerid)
1905 - timer_t timerid;
1906 +timer_delete (timer_t timerid)
1907 {
1908 struct timer_node *timer;
1909 int retval = -1;
1910 diff --git a/sysdeps/unix/sysv/linux/dl-openat64.c b/sysdeps/unix/sysv/linux/dl-openat64.c
1911 index 7d100bb321..7eea0ca8c6 100644
1912 --- a/sysdeps/unix/sysv/linux/dl-openat64.c
1913 +++ b/sysdeps/unix/sysv/linux/dl-openat64.c
1914 @@ -23,10 +23,7 @@
1917 int
1918 -openat64 (dfd, file, oflag)
1919 - int dfd;
1920 - const char *file;
1921 - int oflag;
1922 +openat64 (int dfd, const char *file, int oflag, ...)
1923 {
1924 assert (!__OPEN_NEEDS_MODE (oflag));
1926 diff --git a/time/strptime_l.c b/time/strptime_l.c
1927 index c3ce50fe10..454c6ad6c4 100644
1928 --- a/time/strptime_l.c
1929 +++ b/time/strptime_l.c
1930 @@ -41,9 +41,7 @@
1931 # define localtime_r my_localtime_r
1932 static struct tm *localtime_r (const time_t *, struct tm *);
1933 static struct tm *
1934 -localtime_r (t, tp)
1935 - const time_t *t;
1936 - struct tm *tp;
1937 +localtime_r (const time_t *t, struct tm *tp)
1938 {
1939 struct tm *l = localtime (t);
1940 if (! l)
1941 diff --git a/wcsmbs/mbsnrtowcs.c b/wcsmbs/mbsnrtowcs.c
1942 index 9c354a939b..73a5c7f0c5 100644
1943 --- a/wcsmbs/mbsnrtowcs.c
1944 +++ b/wcsmbs/mbsnrtowcs.c
1945 @@ -38,12 +38,8 @@ static mbstate_t state;
1946 implementation of stdio because we have to deal with unterminated
1947 buffers. At most NMC bytes will be converted. */
1948 size_t
1949 -__mbsnrtowcs (dst, src, nmc, len, ps)
1950 - wchar_t *dst;
1951 - const char **src;
1952 - size_t nmc;
1953 - size_t len;
1954 - mbstate_t *ps;
1955 +__mbsnrtowcs (wchar_t *dst, const char **src, size_t nmc, size_t len,
1956 + mbstate_t *ps)
1957 {
1958 const unsigned char *srcend;
1959 struct __gconv_step_data data;
1960 diff --git a/wcsmbs/mbsrtowcs_l.c b/wcsmbs/mbsrtowcs_l.c
1961 index 557b3ed7bc..d71934117d 100644
1962 --- a/wcsmbs/mbsrtowcs_l.c
1963 +++ b/wcsmbs/mbsrtowcs_l.c
1964 @@ -37,12 +37,8 @@
1966 size_t
1967 attribute_hidden
1968 -__mbsrtowcs_l (dst, src, len, ps, l)
1969 - wchar_t *dst;
1970 - const char **src;
1971 - size_t len;
1972 - mbstate_t *ps;
1973 - __locale_t l;
1974 +__mbsrtowcs_l (wchar_t *dst, const char **src, size_t len, mbstate_t *ps,
1975 + __locale_t l)
1976 {
1977 struct __gconv_step_data data;
1978 size_t result;
1979 diff --git a/wcsmbs/wcsnrtombs.c b/wcsmbs/wcsnrtombs.c
1980 index df83c94391..f257693aba 100644
1981 --- a/wcsmbs/wcsnrtombs.c
1982 +++ b/wcsmbs/wcsnrtombs.c
1983 @@ -37,12 +37,8 @@ static mbstate_t state;
1984 implementation of stdio because we have to deal with unterminated
1985 buffers. At most NWC wide character will be converted. */
1986 size_t
1987 -__wcsnrtombs (dst, src, nwc, len, ps)
1988 - char *dst;
1989 - const wchar_t **src;
1990 - size_t nwc;
1991 - size_t len;
1992 - mbstate_t *ps;
1993 +__wcsnrtombs (char *dst, const wchar_t **src, size_t nwc, size_t len,
1994 + mbstate_t *ps)
1995 {
1996 struct __gconv_step_data data;
1997 const wchar_t *srcend;
1998 diff --git a/wcsmbs/wcsrtombs.c b/wcsmbs/wcsrtombs.c
1999 index bc8e7b8141..ae30368338 100644
2000 --- a/wcsmbs/wcsrtombs.c
2001 +++ b/wcsmbs/wcsrtombs.c
2002 @@ -35,11 +35,7 @@
2003 static mbstate_t state;
2005 size_t
2006 -__wcsrtombs (dst, src, len, ps)
2007 - char *dst;
2008 - const wchar_t **src;
2009 - size_t len;
2010 - mbstate_t *ps;
2011 +__wcsrtombs (char *dst, const wchar_t **src, size_t len, mbstate_t *ps)
2012 {
2013 struct __gconv_step_data data;
2014 int status;
2015 --
2016 2.39.1