diff options
50 files changed, 221 insertions, 355 deletions
@@ -1,5 +1,110 @@ 2015-10-20 Joseph Myers <joseph@codesourcery.com> + * 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. + * crypt/md5-crypt.c (__md5_crypt_r): Convert to prototype-style function definition. * crypt/sha256-crypt.c (__sha256_crypt_r): Likewise. diff --git a/debug/fortify_fail.c b/debug/fortify_fail.c index f992695d14..d4f98da008 100644 --- a/debug/fortify_fail.c +++ b/debug/fortify_fail.c @@ -22,9 +22,8 @@ extern char **__libc_argv attribute_hidden; void -__attribute__ ((noreturn)) -__fortify_fail (msg) - const char *msg; +__attribute__ ((noreturn)) internal_function +__fortify_fail (const char *msg) { /* The loop is added only to keep gcc happy. */ while (1) diff --git a/libio/genops.c b/libio/genops.c index 377bda311f..32fec76648 100644 --- a/libio/genops.c +++ b/libio/genops.c @@ -243,9 +243,7 @@ static int #ifdef _LIBC internal_function #endif -save_for_backup (fp, end_p) - _IO_FILE *fp; - char *end_p; +save_for_backup (_IO_FILE *fp, char *end_p) { /* Append [_IO_read_base..end_p] to backup area. */ _IO_ssize_t least_mark = _IO_least_marker (fp, end_p); diff --git a/libio/wgenops.c b/libio/wgenops.c index e038f2c8bf..5c7cdc523b 100644 --- a/libio/wgenops.c +++ b/libio/wgenops.c @@ -469,9 +469,7 @@ static int #ifdef _LIBC internal_function #endif -save_for_wbackup (fp, end_p) - _IO_FILE *fp; - wchar_t *end_p; +save_for_wbackup (_IO_FILE *fp, wchar_t *end_p) { /* Append [_IO_read_base..end_p] to backup area. */ _IO_ssize_t least_mark = _IO_least_wmarker (fp, end_p); diff --git a/login/grantpt.c b/login/grantpt.c index eb48342bbd..d90c757bd5 100644 --- a/login/grantpt.c +++ b/login/grantpt.c @@ -23,8 +23,7 @@ with the slave to the calling process, and set its group and mode appropriately. Note that this is an unprivileged operation. */ int -grantpt (fd) - int fd __attribute__ ((unused)); +grantpt (int fd __attribute__ ((unused))) { __set_errno (ENOSYS); return -1; diff --git a/login/ptsname.c b/login/ptsname.c index 9536b05698..4fe138d5b0 100644 --- a/login/ptsname.c +++ b/login/ptsname.c @@ -24,18 +24,16 @@ of the associated slave. */ char * -ptsname (fd) - int fd __attribute__ ((unused)); +ptsname (int fd __attribute__ ((unused))) { __set_errno (ENOSYS); return NULL; } int -__ptsname_r (fd, buf, len) - int fd __attribute__ ((unused)); - char *buf __attribute__ ((unused)); - size_t len __attribute__ ((unused)); +__ptsname_r (int fd __attribute__ ((unused)), + char *buf __attribute__ ((unused)), + size_t len __attribute__ ((unused))) { __set_errno (ENOSYS); return ENOSYS; diff --git a/login/unlockpt.c b/login/unlockpt.c index 1f3111e72e..595c3f4efd 100644 --- a/login/unlockpt.c +++ b/login/unlockpt.c @@ -23,8 +23,7 @@ the slave can be opened. This is to avoid a race between opening the master and calling grantpt() to take possession of the slave. */ int -unlockpt (fd) - int fd __attribute__ ((unused)); +unlockpt (int fd __attribute__ ((unused))) { __set_errno (ENOSYS); return -1; diff --git a/mach/msgserver.c b/mach/msgserver.c index 2f4a08ee3a..d90b6c5711 100644 --- a/mach/msgserver.c +++ b/mach/msgserver.c @@ -187,10 +187,10 @@ __mach_msg_server_timeout (boolean_t (*demux) (mach_msg_header_t *request, weak_alias (__mach_msg_server_timeout, mach_msg_server_timeout) mach_msg_return_t -__mach_msg_server (demux, max_size, rcv_name) - boolean_t (*demux) (mach_msg_header_t *in, mach_msg_header_t *out); - mach_msg_size_t max_size; - mach_port_t rcv_name; +__mach_msg_server (boolean_t (*demux) (mach_msg_header_t *in, + mach_msg_header_t *out), + mach_msg_size_t max_size, + mach_port_t rcv_name) { return __mach_msg_server_timeout (demux, max_size, rcv_name, MACH_MSG_OPTION_NONE, diff --git a/misc/efgcvt.c b/misc/efgcvt.c index 05a4253ac2..10a451152f 100644 --- a/misc/efgcvt.c +++ b/misc/efgcvt.c @@ -64,9 +64,8 @@ static char ECVT_BUFFER[MAXDIG]; libc_freeres_ptr (static char *FCVT_BUFPTR); char * -__APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign) - FLOAT_TYPE value; - int ndigit, *decpt, *sign; +__APPEND (FUNC_PREFIX, fcvt) (FLOAT_TYPE value, int ndigit, int *decpt, + int *sign) { if (FCVT_BUFPTR == NULL) { @@ -87,9 +86,8 @@ __APPEND (FUNC_PREFIX, fcvt) (value, ndigit, decpt, sign) char * -__APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign) - FLOAT_TYPE value; - int ndigit, *decpt, *sign; +__APPEND (FUNC_PREFIX, ecvt) (FLOAT_TYPE value, int ndigit, int *decpt, + int *sign) { (void) __APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, ECVT_BUFFER, MAXDIG); @@ -98,10 +96,7 @@ __APPEND (FUNC_PREFIX, ecvt) (value, ndigit, decpt, sign) } char * -__APPEND (FUNC_PREFIX, gcvt) (value, ndigit, buf) - FLOAT_TYPE value; - int ndigit; - char *buf; +__APPEND (FUNC_PREFIX, gcvt) (FLOAT_TYPE value, int ndigit, char *buf) { sprintf (buf, "%.*" FLOAT_FMT_FLAG "g", MIN (ndigit, NDIGIT_MAX), value); return buf; diff --git a/misc/efgcvt_r.c b/misc/efgcvt_r.c index 2761222d87..9f599637d5 100644 --- a/misc/efgcvt_r.c +++ b/misc/efgcvt_r.c @@ -71,11 +71,8 @@ int -__APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len) - FLOAT_TYPE value; - int ndigit, *decpt, *sign; - char *buf; - size_t len; +__APPEND (FUNC_PREFIX, fcvt_r) (FLOAT_TYPE value, int ndigit, int *decpt, + int *sign, char *buf, size_t len) { ssize_t n; ssize_t i; @@ -169,11 +166,8 @@ __APPEND (FUNC_PREFIX, fcvt_r) (value, ndigit, decpt, sign, buf, len) } int -__APPEND (FUNC_PREFIX, ecvt_r) (value, ndigit, decpt, sign, buf, len) - FLOAT_TYPE value; - int ndigit, *decpt, *sign; - char *buf; - size_t len; +__APPEND (FUNC_PREFIX, ecvt_r) (FLOAT_TYPE value, int ndigit, int *decpt, + int *sign, char *buf, size_t len) { int exponent = 0; 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 @@ |