about summary refs log tree commit diff
path: root/stdlib
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2015-10-20 21:27:22 +0000
committerJoseph Myers <joseph@codesourcery.com>2015-10-20 21:27:22 +0000
commit80d9be8122d1fe181d2476b5dad9f4ce37204958 (patch)
tree4aacbba844669804ac4a3802a4001d5257350d11 /stdlib
parent9dd346ff431fc761f1b748bd4da8bb59f7652094 (diff)
downloadglibc-80d9be8122d1fe181d2476b5dad9f4ce37204958.tar.gz
glibc-80d9be8122d1fe181d2476b5dad9f4ce37204958.tar.xz
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 'stdlib')
-rw-r--r--stdlib/add_n.c8
-rw-r--r--stdlib/cmp.c7
-rw-r--r--stdlib/divmod_1.c8
-rw-r--r--stdlib/divrem.c10
-rw-r--r--stdlib/lshift.c8
-rw-r--r--stdlib/mod_1.c7
-rw-r--r--stdlib/mul.c9
-rw-r--r--stdlib/mul_n.c40
-rw-r--r--stdlib/rshift.c8
-rw-r--r--stdlib/strtod.c9
-rw-r--r--stdlib/strtod_l.c5
-rw-r--r--stdlib/strtol.c7
-rw-r--r--stdlib/strtol_l.c15
-rw-r--r--stdlib/sub_n.c8
14 files changed, 9 insertions, 140 deletions
diff --git a/stdlib/add_n.c b/stdlib/add_n.c
index 9d83084f43..4d181000e5 100644
--- a/stdlib/add_n.c
+++ b/stdlib/add_n.c
@@ -22,15 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 #include "gmp-impl.h"
 
 mp_limb_t
-#if __STDC__
 mpn_add_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr, mp_size_t size)
-#else
-mpn_add_n (res_ptr, s1_ptr, s2_ptr, size)
-     register mp_ptr res_ptr;
-     register mp_srcptr s1_ptr;
-     register mp_srcptr s2_ptr;
-     mp_size_t size;
-#endif
 {
   register mp_limb_t x, y, cy;
   register mp_size_t j;
diff --git a/stdlib/cmp.c b/stdlib/cmp.c
index 904f404b8c..3fd7eb21d4 100644
--- a/stdlib/cmp.c
+++ b/stdlib/cmp.c
@@ -27,14 +27,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
    Return 1 if OP1 > OP2, 0 if they are equal, and -1 if OP1 < OP2.  */
 
 int
-#if __STDC__
 mpn_cmp (mp_srcptr op1_ptr, mp_srcptr op2_ptr, mp_size_t size)
-#else
-mpn_cmp (op1_ptr, op2_ptr, size)
-     mp_srcptr op1_ptr;
-     mp_srcptr op2_ptr;
-     mp_size_t size;
-#endif
 {
   mp_size_t i;
   mp_limb_t op1_word, op2_word;
diff --git a/stdlib/divmod_1.c b/stdlib/divmod_1.c
index d05975121f..b38fcfbd51 100644
--- a/stdlib/divmod_1.c
+++ b/stdlib/divmod_1.c
@@ -40,17 +40,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
    here (not udiv_qrnnd).  */
 
 mp_limb_t
-#if __STDC__
 mpn_divmod_1 (mp_ptr quot_ptr,
 	      mp_srcptr dividend_ptr, mp_size_t dividend_size,
 	      mp_limb_t divisor_limb)
-#else
-mpn_divmod_1 (quot_ptr, dividend_ptr, dividend_size, divisor_limb)
-     mp_ptr quot_ptr;
-     mp_srcptr dividend_ptr;
-     mp_size_t dividend_size;
-     mp_limb_t divisor_limb;
-#endif
 {
   mp_size_t i;
   mp_limb_t n1, n0, r;
diff --git a/stdlib/divrem.c b/stdlib/divrem.c
index 6159a3e203..85e424588a 100644
--- a/stdlib/divrem.c
+++ b/stdlib/divrem.c
@@ -40,19 +40,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
    3. NSIZE >= DSIZE, even if QEXTRA_LIMBS is non-zero.  */
 
 mp_limb_t
-#if __STDC__
 mpn_divrem (mp_ptr qp, mp_size_t qextra_limbs,
 	    mp_ptr np, mp_size_t nsize,
 	    mp_srcptr dp, mp_size_t dsize)
-#else
-mpn_divrem (qp, qextra_limbs, np, nsize, dp, dsize)
-     mp_ptr qp;
-     mp_size_t qextra_limbs;
-     mp_ptr np;
-     mp_size_t nsize;
-     mp_srcptr dp;
-     mp_size_t dsize;
-#endif
 {
   mp_limb_t most_significant_q_limb = 0;
 
diff --git a/stdlib/lshift.c b/stdlib/lshift.c
index d7b5ab25ad..80f7fa5a02 100644
--- a/stdlib/lshift.c
+++ b/stdlib/lshift.c
@@ -31,17 +31,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 */
 
 mp_limb_t
-#if __STDC__
 mpn_lshift (register mp_ptr wp,
 	    register mp_srcptr up, mp_size_t usize,
 	    register unsigned int cnt)
-#else
-mpn_lshift (wp, up, usize, cnt)
-     register mp_ptr wp;
-     register mp_srcptr up;
-     mp_size_t usize;
-     register unsigned int cnt;
-#endif
 {
   register mp_limb_t high_limb, low_limb;
   register unsigned sh_1, sh_2;
diff --git a/stdlib/mod_1.c b/stdlib/mod_1.c
index 9323cf72a0..a1762b5662 100644
--- a/stdlib/mod_1.c
+++ b/stdlib/mod_1.c
@@ -37,15 +37,8 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
    here (not udiv_qrnnd).  */
 
 mp_limb_t
-#if __STDC__
 mpn_mod_1 (mp_srcptr dividend_ptr, mp_size_t dividend_size,
 	   mp_limb_t divisor_limb)
-#else
-mpn_mod_1 (dividend_ptr, dividend_size, divisor_limb)
-     mp_srcptr dividend_ptr;
-     mp_size_t dividend_size;
-     mp_limb_t divisor_limb;
-#endif
 {
   mp_size_t i;
   mp_limb_t n1, n0, r;
diff --git a/stdlib/mul.c b/stdlib/mul.c
index bfcd0747f0..c603c18016 100644
--- a/stdlib/mul.c
+++ b/stdlib/mul.c
@@ -42,18 +42,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 #endif
 
 mp_limb_t
-#if __STDC__
 mpn_mul (mp_ptr prodp,
 	 mp_srcptr up, mp_size_t usize,
 	 mp_srcptr vp, mp_size_t vsize)
-#else
-mpn_mul (prodp, up, usize, vp, vsize)
-     mp_ptr prodp;
-     mp_srcptr up;
-     mp_size_t usize;
-     mp_srcptr vp;
-     mp_size_t vsize;
-#endif
 {
   mp_ptr prod_endp = prodp + usize + vsize - 1;
   mp_limb_t cy;
diff --git a/stdlib/mul_n.c b/stdlib/mul_n.c
index f48b2cfcbd..b01e64665e 100644
--- a/stdlib/mul_n.c
+++ b/stdlib/mul_n.c
@@ -49,15 +49,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
    algorithm below.  */
 
 void
-#if __STDC__
 impn_mul_n_basecase (mp_ptr prodp, mp_srcptr up, mp_srcptr vp, mp_size_t size)
-#else
-impn_mul_n_basecase (prodp, up, vp, size)
-     mp_ptr prodp;
-     mp_srcptr up;
-     mp_srcptr vp;
-     mp_size_t size;
-#endif
 {
   mp_size_t i;
   mp_limb_t cy_limb;
@@ -100,17 +92,8 @@ impn_mul_n_basecase (prodp, up, vp, size)
 }
 
 void
-#if __STDC__
 impn_mul_n (mp_ptr prodp,
 	     mp_srcptr up, mp_srcptr vp, mp_size_t size, mp_ptr tspace)
-#else
-impn_mul_n (prodp, up, vp, size, tspace)
-     mp_ptr prodp;
-     mp_srcptr up;
-     mp_srcptr vp;
-     mp_size_t size;
-     mp_ptr tspace;
-#endif
 {
   if ((size & 1) != 0)
     {
@@ -219,14 +202,7 @@ impn_mul_n (prodp, up, vp, size, tspace)
 }
 
 void
-#if __STDC__
 impn_sqr_n_basecase (mp_ptr prodp, mp_srcptr up, mp_size_t size)
-#else
-impn_sqr_n_basecase (prodp, up, size)
-     mp_ptr prodp;
-     mp_srcptr up;
-     mp_size_t size;
-#endif
 {
   mp_size_t i;
   mp_limb_t cy_limb;
@@ -269,16 +245,8 @@ impn_sqr_n_basecase (prodp, up, size)
 }
 
 void
-#if __STDC__
 impn_sqr_n (mp_ptr prodp,
 	     mp_srcptr up, mp_size_t size, mp_ptr tspace)
-#else
-impn_sqr_n (prodp, up, size, tspace)
-     mp_ptr prodp;
-     mp_srcptr up;
-     mp_size_t size;
-     mp_ptr tspace;
-#endif
 {
   if ((size & 1) != 0)
     {
@@ -358,15 +326,7 @@ impn_sqr_n (prodp, up, size, tspace)
 
 /* This should be made into an inline function in gmp.h.  */
 void
-#if __STDC__
 mpn_mul_n (mp_ptr prodp, mp_srcptr up, mp_srcptr vp, mp_size_t size)
-#else
-mpn_mul_n (prodp, up, vp, size)
-     mp_ptr prodp;
-     mp_srcptr up;
-     mp_srcptr vp;
-     mp_size_t size;
-#endif
 {
   TMP_DECL (marker);
   TMP_MARK (marker);
diff --git a/stdlib/rshift.c b/stdlib/rshift.c
index 8aaee2e2e9..21c5588edd 100644
--- a/stdlib/rshift.c
+++ b/stdlib/rshift.c
@@ -31,17 +31,9 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 */
 
 mp_limb_t
-#if __STDC__
 mpn_rshift (register mp_ptr wp,
 	    register mp_srcptr up, mp_size_t usize,
 	    register unsigned int cnt)
-#else
-mpn_rshift (wp, up, usize, cnt)
-     register mp_ptr wp;
-     register mp_srcptr up;
-     mp_size_t usize;
-     register unsigned int cnt;
-#endif
 {
   register mp_limb_t high_limb, low_limb;
   register unsigned sh_1, sh_2;
diff --git a/stdlib/strtod.c b/stdlib/strtod.c
index 645293b719..dfd33ccff0 100644
--- a/stdlib/strtod.c
+++ b/stdlib/strtod.c
@@ -46,10 +46,7 @@
 
 
 FLOAT
-INTERNAL (STRTOF) (nptr, endptr, group)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
-     int group;
+INTERNAL (STRTOF) (const STRING_TYPE *nptr, STRING_TYPE **endptr, int group)
 {
   return INTERNAL(STRTOF_L) (nptr, endptr, group, _NL_CURRENT_LOCALE);
 }
@@ -62,9 +59,7 @@ FLOAT
 #ifdef weak_function
 weak_function
 #endif
-STRTOF (nptr, endptr)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
+STRTOF (const STRING_TYPE *nptr, STRING_TYPE **endptr)
 {
   return INTERNAL(STRTOF_L) (nptr, endptr, 0, _NL_CURRENT_LOCALE);
 }
diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c
index f07b0f368b..89e03841ee 100644
--- a/stdlib/strtod_l.c
+++ b/stdlib/strtod_l.c
@@ -1781,10 +1781,7 @@ FLOAT
 #ifdef weak_function
 weak_function
 #endif
-__STRTOF (nptr, endptr, loc)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
-     __locale_t loc;
+__STRTOF (const STRING_TYPE *nptr, STRING_TYPE **endptr, __locale_t loc)
 {
   return ____STRTOF_INTERNAL (nptr, endptr, 0, loc);
 }
diff --git a/stdlib/strtol.c b/stdlib/strtol.c
index 7afad19d26..dbe0e77079 100644
--- a/stdlib/strtol.c
+++ b/stdlib/strtol.c
@@ -92,11 +92,8 @@ extern INT INTERNAL (__strtol_l) (const STRING_TYPE *, STRING_TYPE **, int,
 
 
 INT
-INTERNAL (strtol) (nptr, endptr, base, group)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
-     int base;
-     int group;
+INTERNAL (strtol) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+		   int base, int group)
 {
   return INTERNAL (__strtol_l) (nptr, endptr, base, group, _NL_CURRENT_LOCALE);
 }
diff --git a/stdlib/strtol_l.c b/stdlib/strtol_l.c
index f3319a8936..8f6163d2f1 100644
--- a/stdlib/strtol_l.c
+++ b/stdlib/strtol_l.c
@@ -222,12 +222,8 @@ extern const unsigned char __strtol_ull_rem_tab[] attribute_hidden;
    one converted is stored in *ENDPTR.  */
 
 INT
-INTERNAL (__strtol_l) (nptr, endptr, base, group, loc)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
-     int base;
-     int group;
-     __locale_t loc;
+INTERNAL (__strtol_l) (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+		       int base, int group, __locale_t loc)
 {
   int negative;
   unsigned LONG int cutoff;
@@ -546,11 +542,8 @@ INT
 #ifdef weak_function
 weak_function
 #endif
-__strtol_l (nptr, endptr, base, loc)
-     const STRING_TYPE *nptr;
-     STRING_TYPE **endptr;
-     int base;
-     __locale_t loc;
+__strtol_l (const STRING_TYPE *nptr, STRING_TYPE **endptr,
+	    int base, __locale_t loc)
 {
   return INTERNAL (__strtol_l) (nptr, endptr, base, 0, loc);
 }
diff --git a/stdlib/sub_n.c b/stdlib/sub_n.c
index 2e2e7dbcd0..156f4ec0be 100644
--- a/stdlib/sub_n.c
+++ b/stdlib/sub_n.c
@@ -22,15 +22,7 @@ along with the GNU MP Library; see the file COPYING.LIB.  If not, see
 #include "gmp-impl.h"
 
 mp_limb_t
-#if __STDC__
 mpn_sub_n (mp_ptr res_ptr, mp_srcptr s1_ptr, mp_srcptr s2_ptr, mp_size_t size)
-#else
-mpn_sub_n (res_ptr, s1_ptr, s2_ptr, size)
-     register mp_ptr res_ptr;
-     register mp_srcptr s1_ptr;
-     register mp_srcptr s2_ptr;
-     mp_size_t size;
-#endif
 {
   register mp_limb_t x, y, cy;
   register mp_size_t j;