diff options
author | Joseph Myers <joseph@codesourcery.com> | 2015-10-20 21:27:22 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2015-10-20 21:27:22 +0000 |
commit | 80d9be8122d1fe181d2476b5dad9f4ce37204958 (patch) | |
tree | 4aacbba844669804ac4a3802a4001d5257350d11 /nptl | |
parent | 9dd346ff431fc761f1b748bd4da8bb59f7652094 (diff) | |
download | glibc-80d9be8122d1fe181d2476b5dad9f4ce37204958.tar glibc-80d9be8122d1fe181d2476b5dad9f4ce37204958.tar.gz glibc-80d9be8122d1fe181d2476b5dad9f4ce37204958.tar.bz2 glibc-80d9be8122d1fe181d2476b5dad9f4ce37204958.zip |
Convert miscellaneous function definitions to prototype style.
This patch converts various miscellaneous functions definitions in
glibc, found with grep and not covered by my previous scripted
conversions, from old-style K&R to prototype-style. These changes
were made manually. This is not necessarily exhaustive as formatting
variants may have prevented my grep from finding some such
definitions.
Regarding the changes to files from GMP, they may originally have been
omitted when removing __STDC__ conditionals because of the files
coming from another package, but (a) GMP no longer has __STDC__
conditionals there anyway and (b) we don't try to keep these files
verbatim in sync with GMP (and there are licensing differences), so
making the change to them in glibc seems reasonable.
Tested for x86_64 and x86 (testsuite - this patch affects files
containing assertions).
* debug/fortify_fail.c (__fortify_fail): Convert to
prototype-style function definition. Use internal_function.
* libio/genops.c (save_for_backup): Convert to prototype-style
function definition.
* libio/wgenops.c (save_for_wbackup): Likewise.
* login/grantpt.c (grantpt): Likewise.
* login/ptsname.c (ptsname): Likewise.
(__ptsname_r): Likewise.
* login/unlockpt.c (unlockpt): Likewise.
* mach/msgserver.c (__mach_msg_server): Likewise.
* misc/efgcvt.c (__APPEND (FUNC_PREFIX, fcvt)): Likewise.
(__APPEND (FUNC_PREFIX, ecvt)): Likewise.
(__APPEND (FUNC_PREFIX, gcvt)): Likewise.
* misc/efgcvt_r.c (__APPEND (FUNC_PREFIX, fcvt_r)): Likewise.
(__APPEND (FUNC_PREFIX, ecvt_r)): Likewise.
* nptl/cleanup_compat.c (_pthread_cleanup_push): Likewise.
* nptl/cleanup_defer_compat.c (_pthread_cleanup_push_defer):
Likewise.
* nptl/libc_pthread_init.c (__libc_pthread_init): Likewise. Use
internal_function.
* nptl/pthread_atfork.c (__pthread_atfork): Convert to
prototype-style function definition.
* nptl/pthread_create.c (__pthread_create_2_1): Likewise.
[SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)]
(__pthread_create_2_0): Likewise.
* nptl/pthread_key_create.c (__pthread_key_create): Likewise.
* nptl/register-atfork.c (__register_atfork): Likewise.
* posix/glob.c (glob): Likewise.
* posix/regcomp.c (re_comp): Likewise.
* posix/regexec.c (re_exec): Likewise.
* stdlib/add_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/cmp.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/divmod_1.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/divrem.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/lshift.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mod_1.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mul.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/mul_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/rshift.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* stdlib/strtod.c (INTERNAL (STRTOF)): Convert to prototype-style
function definition.
(STRTOF): Likewise.
* stdlib/strtod_l.c (__STRTOF): Likewise.
* stdlib/strtol.c (INTERNAL (strtol)): Likewise.
* stdlib/strtol_l.c (INTERNAL (__strtol_l)): Likewise.
(__strtol_l): Likewise.
* stdlib/sub_n.c [__STDC__]: Make code unconditional.
[!__STDC__]: Remove conditional code.
* string/memrchr.c (MEMRCHR): Convert to prototype-style function
definition.
* string/strcasecmp.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__strcasecmp): Convert to prototype-style function definition.
* string/strncase.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__strncasecmp): Convert to prototype-style function definition.
* sunrpc/pm_getport.c (__libc_rpc_getport): Likewise.
* sunrpc/xdr.c (xdr_union): Likewise.
* sunrpc/xdr_array.c (xdr_array): Likewise.
* sunrpc/xdr_ref.c (xdr_reference): Likewise.
* sysdeps/m68k/m680x0/fpu/s_atan.c (__CONCATX(__,FUNC)): Likewise.
* sysdeps/m68k/m680x0/fpu/s_isinf.c (__CONCATX(__,FUNC)):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_scalbn.c (__CONCATX(__scalbn,suffix):
Likewise.
* sysdeps/m68k/m680x0/fpu/s_sincos.c (CONCATX(__,FUNC)): Likewise.
* sysdeps/unix/sysv/linux/i386/scandir64.c (__old_scandir64):
Likewise.
* time/strftime_l.c (LOCALE_PARAM_DECL): Remove macro.
(LOCALE_PARAM_PROTO): Likewise.
[_LIBC && USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include
argument type.
(ut_argument_spec): Remove macro.
(ut_argument_spec_iso): Rename to ut_argument_spec.
(memcpy_lowcase): Use LOCALE_PARAM in declaration. Convert to
prototype-style function definition.
(memcpy_uppcase): Likewise.
(__strftime_internal): Likewise.
(my_strftime): Likewise.
* time/strptime_l.c (LOCALE_PARAM_PROTO): Remove macro.
(LOCALE_PARAM_DECL): Likewise.
[_LIBC] (LOCALE_PARAM): Include argument type.
(__strptime_internal): Convert to prototype-style function
definition.
(strptime): Likewise.
* wcsmbs/wcscasecmp.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__wcscasecmp): Convert to prototype-style function definition.
* wcsmbs/wcsncase.c (LOCALE_PARAM_DECL): Remove macro.
[USE_IN_EXTENDED_LOCALE_MODEL] (LOCALE_PARAM): Include argument
type.
(__wcsncasecmp): Convert to prototype-style function definition.
Diffstat (limited to 'nptl')
-rw-r--r-- | nptl/cleanup_compat.c | 6 | ||||
-rw-r--r-- | nptl/cleanup_defer_compat.c | 6 | ||||
-rw-r--r-- | nptl/libc_pthread_init.c | 7 | ||||
-rw-r--r-- | nptl/pthread_atfork.c | 6 | ||||
-rw-r--r-- | nptl/pthread_create.c | 14 | ||||
-rw-r--r-- | nptl/pthread_key_create.c | 4 | ||||
-rw-r--r-- | nptl/register-atfork.c | 7 |
7 files changed, 16 insertions, 34 deletions
diff --git a/nptl/cleanup_compat.c b/nptl/cleanup_compat.c index 51de3e2973..166d465c66 100644 --- a/nptl/cleanup_compat.c +++ b/nptl/cleanup_compat.c @@ -21,10 +21,8 @@ void -_pthread_cleanup_push (buffer, routine, arg) - struct _pthread_cleanup_buffer *buffer; - void (*routine) (void *); - void *arg; +_pthread_cleanup_push (struct _pthread_cleanup_buffer *buffer, + void (*routine) (void *), void *arg) { struct pthread *self = THREAD_SELF; diff --git a/nptl/cleanup_defer_compat.c b/nptl/cleanup_defer_compat.c index e4fa87dd01..e6fb0769ab 100644 --- a/nptl/cleanup_defer_compat.c +++ b/nptl/cleanup_defer_compat.c @@ -20,10 +20,8 @@ void -_pthread_cleanup_push_defer (buffer, routine, arg) - struct _pthread_cleanup_buffer *buffer; - void (*routine) (void *); - void *arg; +_pthread_cleanup_push_defer (struct _pthread_cleanup_buffer *buffer, + void (*routine) (void *), void *arg) { struct pthread *self = THREAD_SELF; diff --git a/nptl/libc_pthread_init.c b/nptl/libc_pthread_init.c index d7f4eb0b89..b1ea3516a7 100644 --- a/nptl/libc_pthread_init.c +++ b/nptl/libc_pthread_init.c @@ -38,10 +38,9 @@ extern int __libc_multiple_threads attribute_hidden; int * #endif -__libc_pthread_init (ptr, reclaim, functions) - unsigned long int *ptr; - void (*reclaim) (void); - const struct pthread_functions *functions; +internal_function +__libc_pthread_init (unsigned long int *ptr, void (*reclaim) (void), + const struct pthread_functions *functions) { /* Remember the pointer to the generation counter in libpthread. */ __fork_generation_pointer = ptr; diff --git a/nptl/pthread_atfork.c b/nptl/pthread_atfork.c index 8f873a3cc1..19328a51dd 100644 --- a/nptl/pthread_atfork.c +++ b/nptl/pthread_atfork.c @@ -48,10 +48,8 @@ int /* Don't mark the compatibility function as hidden. */ attribute_hidden #endif -__pthread_atfork (prepare, parent, child) - void (*prepare) (void); - void (*parent) (void); - void (*child) (void); +__pthread_atfork (void (*prepare) (void), void (*parent) (void), + void (*child) (void)) { return __register_atfork (prepare, parent, child, &__dso_handle == NULL ? NULL : __dso_handle); diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c index 790f46db3f..83317f0928 100644 --- a/nptl/pthread_create.c +++ b/nptl/pthread_create.c @@ -487,11 +487,8 @@ report_thread_creation (struct pthread *pd) int -__pthread_create_2_1 (newthread, attr, start_routine, arg) - pthread_t *newthread; - const pthread_attr_t *attr; - void *(*start_routine) (void *); - void *arg; +__pthread_create_2_1 (pthread_t *newthread, const pthread_attr_t *attr, + void *(*start_routine) (void *), void *arg) { STACK_VARIABLES; @@ -723,11 +720,8 @@ versioned_symbol (libpthread, __pthread_create_2_1, pthread_create, GLIBC_2_1); #if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1) int -__pthread_create_2_0 (newthread, attr, start_routine, arg) - pthread_t *newthread; - const pthread_attr_t *attr; - void *(*start_routine) (void *); - void *arg; +__pthread_create_2_0 (pthread_t *newthread, const pthread_attr_t *attr, + void *(*start_routine) (void *), void *arg) { /* The ATTR attribute is not really of type `pthread_attr_t *'. It has the old size and access to the new members might crash the program. diff --git a/nptl/pthread_key_create.c b/nptl/pthread_key_create.c index a642c6929f..021d29d666 100644 --- a/nptl/pthread_key_create.c +++ b/nptl/pthread_key_create.c @@ -22,9 +22,7 @@ int -__pthread_key_create (key, destr) - pthread_key_t *key; - void (*destr) (void *); +__pthread_key_create (pthread_key_t *key, void (*destr) (void *)) { /* Find a slot in __pthread_keys which is unused. */ for (size_t cnt = 0; cnt < PTHREAD_KEYS_MAX; ++cnt) diff --git a/nptl/register-atfork.c b/nptl/register-atfork.c index 681bb574c8..151214e1d5 100644 --- a/nptl/register-atfork.c +++ b/nptl/register-atfork.c @@ -80,11 +80,8 @@ fork_handler_alloc (void) int -__register_atfork (prepare, parent, child, dso_handle) - void (*prepare) (void); - void (*parent) (void); - void (*child) (void); - void *dso_handle; +__register_atfork (void (*prepare) (void), void (*parent) (void), + void (*child) (void), void *dso_handle) { /* Get the lock to not conflict with other allocations. */ lll_lock (__fork_lock, LLL_PRIVATE); |