diff options
Diffstat (limited to 'stdlib')
| -rw-r--r-- | stdlib/atexit.c | 32 | ||||
| -rw-r--r-- | stdlib/div.c | 91 | ||||
| -rw-r--r-- | stdlib/l64a.c | 40 | ||||
| -rw-r--r-- | stdlib/ldiv.c | 54 | ||||
| -rw-r--r-- | stdlib/lldiv.c | 57 | ||||
| -rw-r--r-- | stdlib/stdlib.h | 127 | ||||
| -rw-r--r-- | stdlib/strtol.c | 10 | ||||
| -rw-r--r-- | stdlib/tst-strtol.c | 23 |
8 files changed, 142 insertions, 292 deletions
diff --git a/stdlib/atexit.c b/stdlib/atexit.c index bf7f91a22b..a49f219158 100644 --- a/stdlib/atexit.c +++ b/stdlib/atexit.c @@ -1,20 +1,20 @@ /* Copyright (C) 1991, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <libc-lock.h> #include <stdlib.h> diff --git a/stdlib/div.c b/stdlib/div.c deleted file mode 100644 index 51f5e35e71..0000000000 --- a/stdlib/div.c +++ /dev/null @@ -1,91 +0,0 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -/* - * Copyright (c) 1990 Regents of the University of California. - * All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Chris Torek. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <ansidecl.h> -#include <stdlib.h> - - -/* Return the `div_t' representation of NUMER over DENOM. */ -div_t -DEFUN(div, (numer, denom), int numer AND int denom) -{ - div_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - /* The ANSI standard says that |QUOT| <= |NUMER / DENOM|, where - NUMER / DENOM is to be computed in infinite precision. In - other words, we should always truncate the quotient towards - zero, never -infinity. Machine division and remainer may - work either way when one or both of NUMER or DENOM is - negative. If only one is negative and QUOT has been - truncated towards -infinity, REM will have the same sign as - DENOM and the opposite sign of NUMER; if both are negative - and QUOT has been truncated towards -infinity, REM will be - positive (will have the opposite sign of NUMER). These are - considered `wrong'. If both are NUM and DENOM are positive, - RESULT will always be positive. This all boils down to: if - NUMER >= 0, but REM < 0, we got the wrong answer. In that - case, to get the right answer, add 1 to QUOT and subtract - DENOM from REM. */ - - if (numer >= 0 && result.rem < 0) - { - ++result.quot; - result.rem -= denom; - } - - return result; -} diff --git a/stdlib/l64a.c b/stdlib/l64a.c index 914f0b5ded..1559b5b43a 100644 --- a/stdlib/l64a.c +++ b/stdlib/l64a.c @@ -1,21 +1,21 @@ /* Copyright (C) 1995, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, August 1995. -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <stdlib.h> @@ -34,18 +34,24 @@ static const char conv_table[64] = char * l64a (n) - long n; + long int n; { static char result[7]; int cnt; + if (n <= 0l) + /* The value for N == 0 is defined to be the empty string. When a + negative value is given the result is undefined. We will + return the empty string. */ + return (char *) ""; + result[6] = '\0'; - for (cnt = 5; cnt >= 0; --cnt) + for (cnt = 5; n > 0; --cnt) { result[cnt] = conv_table[n & 0x3f]; n >>= 6; } - return result; + return &result[n + 1]; } diff --git a/stdlib/ldiv.c b/stdlib/ldiv.c deleted file mode 100644 index 995e40de39..0000000000 --- a/stdlib/ldiv.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 1992 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ - -#include <stdlib.h> - - -/* Return the `ldiv_t' representation of NUMER over DENOM. */ -ldiv_t -ldiv (long int numer, long int denom) -{ - ldiv_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - /* The ANSI standard says that |QUOT| <= |NUMER / DENOM|, where - NUMER / DENOM is to be computed in infinite precision. In - other words, we should always truncate the quotient towards - zero, never -infinity. Machine division and remainer may - work either way when one or both of NUMER or DENOM is - negative. If only one is negative and QUOT has been - truncated towards -infinity, REM will have the same sign as - DENOM and the opposite sign of NUMER; if both are negative - and QUOT has been truncated towards -infinity, REM will be - positive (will have the opposite sign of NUMER). These are - considered `wrong'. If both are NUM and DENOM are positive, - RESULT will always be positive. This all boils down to: if - NUMER >= 0, but REM < 0, we got the wrong answer. In that - case, to get the right answer, add 1 to QUOT and subtract - DENOM from REM. */ - - if (numer >= 0 && result.rem < 0) - { - ++result.quot; - result.rem -= denom; - } - - return result; -} diff --git a/stdlib/lldiv.c b/stdlib/lldiv.c deleted file mode 100644 index 1659e0f837..0000000000 --- a/stdlib/lldiv.c +++ /dev/null @@ -1,57 +0,0 @@ -/* `long long int' divison with remainder. -Copyright (C) 1992, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. - -The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. - -The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Library General Public License for more details. - -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include <stdlib.h> - - -/* Return the `lldiv_t' representation of NUMER over DENOM. */ -lldiv_t -lldiv (numer, denom) - long long int numer; - long long int denom; -{ - lldiv_t result; - - result.quot = numer / denom; - result.rem = numer % denom; - - /* The ANSI standard says that |QUOT| <= |NUMER / DENOM|, where - NUMER / DENOM is to be computed in infinite precision. In - other words, we should always truncate the quotient towards - zero, never -infinity. Machine division and remainer may - work either way when one or both of NUMER or DENOM is - negative. If only one is negative and QUOT has been - truncated towards -infinity, REM will have the same sign as - DENOM and the opposite sign of NUMER; if both are negative - and QUOT has been truncated towards -infinity, REM will be - positive (will have the opposite sign of NUMER). These are - considered `wrong'. If both are NUM and DENOM are positive, - RESULT will always be positive. This all boils down to: if - NUMER >= 0, but REM < 0, we got the wrong answer. In that - case, to get the right answer, add 1 to QUOT and subtract - DENOM from REM. */ - - if (numer >= 0 && result.rem < 0) - { - ++result.quot; - result.rem -= denom; - } - - return result; -} diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index b43c170951..8f94f3b168 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -188,7 +188,7 @@ extern __inline long int atol (__const char *__nptr) #endif /* Optimizing GCC >=2. */ -#ifdef __USE_SVID +#if defined(__USE_SVID) || defined(__USE_XOPEN_EXTENDED) /* Convert N to base 64 using the digits "./0-9A-Za-z", least-significant digit first. Returns a pointer to static storage overwritten by the next call. */ @@ -196,15 +196,7 @@ extern char *l64a __P ((long int __n)); /* Read a number from a string S in base 64 as above. */ extern long int a64l __P ((__const char *__s)); -#endif - - -/* Return a random integer between 0 and RAND_MAX inclusive. */ -extern int rand __P ((void)); -/* Seed the random number generator with the given number. */ -extern void srand __P ((unsigned int __seed)); -#ifdef __USE_BSD #include <sys/types.h> /* we need int32_t... */ @@ -262,13 +254,36 @@ extern int srandom_r __P ((unsigned int __seed, struct random_data *__buf)); extern int initstate_r __P ((unsigned int __seed, __ptr_t __statebuf, size_t __statelen, struct random_data *__buf)); extern int setstate_r __P ((__ptr_t __statebuf, struct random_data *__buf)); -#endif /* __USE_REENTRANT. */ +#endif /* Use reentrant. */ #endif /* Use BSD. */ -#ifdef __USE_SVID +/* Return a random integer between 0 and RAND_MAX inclusive. */ +extern int rand __P ((void)); +/* Seed the random number generator with the given number. */ +extern void srand __P ((unsigned int __seed)); + + +#if defined(__USE_SVID) || defined(__USE_XOPEN) /* System V style 48-bit random number generator functions. */ +/* Return non-negative, double-precision floating-point value in [0.0,1.0). */ +extern double drand48 __P ((void)); +extern double erand48 __P ((unsigned short int __xsubi[3])); + +/* Return non-negative, long integer in [0,2^31). */ +extern long lrand48 __P ((void)); +extern long nrand48 __P ((unsigned short int __xsubi[3])); + +/* Return signed, long integers in [-2^31,2^31). */ +extern long mrand48 __P ((void)); +extern long jrand48 __P ((unsigned short int __xsubi[3])); + +/* Seed random number generator. */ +extern void srand48 __P ((long __seedval)); +extern unsigned short int *seed48 __P ((unsigned short int __seed16v[3])); +extern void lcong48 __P ((unsigned short int __param[7])); + /* Data structure for communication with thread safe versions. */ struct drand48_data { @@ -279,38 +294,34 @@ struct drand48_data int init; /* Flag for initializing. */ }; +#ifdef __USE_REENTRANT /* Return non-negative, double-precision floating-point value in [0.0,1.0). */ -extern double drand48 __P ((void)); extern int drand48_r __P ((struct drand48_data *__buffer, double *__result)); -extern double erand48 __P ((unsigned short int __xsubi[3])); extern int erand48_r __P ((unsigned short int __xsubi[3], struct drand48_data *__buffer, double *__result)); + /* Return non-negative, long integer in [0,2^31). */ -extern long lrand48 __P ((void)); extern int lrand48_r __P ((struct drand48_data *__buffer, long *__result)); -extern long nrand48 __P ((unsigned short int __xsubi[3])); extern int nrand48_r __P ((unsigned short int __xsubi[3], struct drand48_data *__buffer, long *__result)); + /* Return signed, long integers in [-2^31,2^31). */ -extern long mrand48 __P ((void)); extern int mrand48_r __P ((struct drand48_data *__buffer, long *__result)); -extern long jrand48 __P ((unsigned short int __xsubi[3])); extern int jrand48_r __P ((unsigned short int __xsubi[3], struct drand48_data *__buffer, long *__result)); + /* Seed random number generator. */ -extern void srand48 __P ((long __seedval)); extern int srand48_r __P ((long __seedval, struct drand48_data *__buffer)); -extern unsigned short int *seed48 __P ((unsigned short int __seed16v[3])); extern int seed48_r __P ((unsigned short int __seed16v[3], struct drand48_data *__buffer)); -extern void lcong48 __P ((unsigned short int __param[7])); extern int lcong48_r __P ((unsigned short int __param[7], struct drand48_data *__buffer)); +#endif /* Use reentrant. */ /* Internal function to compute next state of the generator. */ extern int __drand48_iterate __P ((unsigned short int __xsubi[3], struct drand48_data *__buffer)); -#endif /* __USE_SVID. */ +#endif /* Use SVID or X/Open. */ /* Allocate SIZE bytes of memory. */ @@ -332,7 +343,7 @@ extern void cfree __P ((__ptr_t __ptr)); #include <alloca.h> #endif /* Use GNU, BSD, or misc. */ -#ifdef __USE_BSD +#if defined(__USE_BSD) || defined(__USE_XOPEN_EXTENDED) /* Allocate SIZE bytes on a page boundary. The storage cannot be freed. */ extern __ptr_t valloc __P ((size_t __size)); #endif @@ -365,7 +376,7 @@ extern char *getenv __P ((__const char *__name)); programs is running with SUID or SGID enabled. */ extern char *__secure_getenv __P ((__const char *__name)); -#ifdef __USE_SVID +#if defined(__USE_SVID) || defined(__USE_XOPEN) /* The SVID says this is in <stdio.h>, but this seems a better place. */ /* Put STRING, which is of the form "NAME=VALUE", in the environment. If there is no `=', remove NAME from the environment. */ @@ -389,6 +400,23 @@ extern void unsetenv __P ((__const char *__name)); extern int clearenv __P ((void)); #endif + +#if defined(__USE_MISC) || defined(__USE_XOPEN_EXTENDED) +/* Generate a unique temporary file name from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the file name unique. + Returns TEMPLATE, or a null pointer if it cannot get a unique file name. */ +extern char *mktemp __P ((char *__template)); + +/* Generate a unique temporary file name from TEMPLATE. + The last six characters of TEMPLATE must be "XXXXXX"; + they are replaced with a string that makes the filename unique. + Returns a file descriptor open on the file for reading and writing, + or -1 if it cannot create a uniquely-named file. */ +extern int mkstemp __P ((char *__template)); +#endif + + /* Execute the given line as a shell command. */ extern int system __P ((__const char *__command)); @@ -400,7 +428,7 @@ extern int system __P ((__const char *__command)); extern char *canonicalize_file_name __P ((__const char *__name)); #endif -#ifdef __USE_BSD +#if defined(__USE_BSD) || defined(__USE_XOPEN_EXTENDED) /* Return the canonical absolute name of file NAME. The last file name component need not exist, and may be a symlink to a nonexistent file. If RESOLVED is null, the result is malloc'd; otherwise, if the canonical @@ -451,47 +479,49 @@ extern lldiv_t lldiv __P ((long long int __numer, long long int __denom)) __attr #endif -#ifdef __USE_SVID +#if defined(__USE_SVID) || defined(__USE_XOPEN_EXTENDED) /* Convert floating point numbers to strings. The returned values are valid only until another call to the same function. */ /* Convert VALUE to a string with NDIGIT digits and return a pointer to this. Set *DECPT with the position of the decimal character and *SIGN with the sign of the number. */ -char *ecvt __P ((double __value, int __ndigit, int *__decpt, int *__sign)); +extern char *ecvt __P ((double __value, int __ndigit, int *__decpt, + int *__sign)); /* Convert VALUE to a string rounded to NDIGIT decimal digits. Set *DECPT with the position of the decimal character and *SIGN with the sign of the number. */ -char *fcvt __P ((double __value, int __ndigit, int *__decpt, int *__sign)); +extern char *fcvt __P ((double __value, int __ndigit, int *__decpt, + int *__sign)); /* If possible convert VALUE to a string with NDIGIT significant digits. Otherwise use exponential representation. The resulting string will be written to BUF. */ -char *gcvt __P ((double __value, int __ndigit, char *__buf)); +extern char *gcvt __P ((double __value, int __ndigit, char *__buf)); /* Long double versions of above functions. */ -char *qecvt __P ((__long_double_t __value, int __ndigit, int *__decpt, - int *__sign)); -char *qfcvt __P ((__long_double_t __value, int __ndigit, int *__decpt, - int *__sign)); -char *qgcvt __P ((__long_double_t __value, int __ndigit, char *__buf)); +extern char *qecvt __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *__sign)); +extern char *qfcvt __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *__sign)); +extern char *qgcvt __P ((__long_double_t __value, int __ndigit, char *__buf)); #ifdef __USE_REENTRANT /* Reentrant version of the functions above which provide their own buffers. */ -int ecvt_r __P ((double __value, int __ndigit, int *__decpt, int *__sign, - char *__buf, size_t __len)); -int fcvt_r __P ((double __value, int __ndigit, int *__decpt, int *__sign, - char *__buf, size_t __len)); - -int qecvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, - int *__sign, char *__buf, size_t __len)); -int qfcvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, - int *__sign, char *__buf, size_t __len)); -#endif -#endif +extern int ecvt_r __P ((double __value, int __ndigit, int *__decpt, + int *__sign, char *__buf, size_t __len)); +extern int fcvt_r __P ((double __value, int __ndigit, int *__decpt, + int *__sign, char *__buf, size_t __len)); + +extern int qecvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *__sign, char *__buf, size_t __len)); +extern int qfcvt_r __P ((__long_double_t __value, int __ndigit, int *__decpt, + int *__sign, char *__buf, size_t __len)); +#endif /* reentrant */ +#endif /* use MISC || use X/Open Unix */ /* Return the length of the multibyte character @@ -525,7 +555,7 @@ extern int rpmatch __P ((__const char *__response)); #endif -#ifdef __USE_MISC +#ifdef __USE_XOPEN_EXTENDED /* Parse comma separated suboption from *OPTIONP and match against strings in TOKENS. If found return index and set *VALUEP to optional value introduced by an equal sign. If the suboption is @@ -537,6 +567,13 @@ extern int getsubopt __P ((char **__optionp, __const char *__const *__tokens, #endif +#ifdef __USE_XOPEN + +/* Setup DES tables according KEY. */ +extern void setkey __P ((__const char *__key)); +#endif + + __END_DECLS #endif /* stdlib.h */ diff --git a/stdlib/strtol.c b/stdlib/strtol.c index c38f61c52f..5a097b40a4 100644 --- a/stdlib/strtol.c +++ b/stdlib/strtol.c @@ -201,7 +201,10 @@ INTERNAL (strtol) (nptr, endptr, base, group) #endif if (base < 0 || base == 1 || base > 36) - base = 10; + { + __set_errno (EINVAL); + return 0; + } save = s = nptr; @@ -214,8 +217,13 @@ INTERNAL (strtol) (nptr, endptr, base, group) /* Check for a sign. */ if (*s == L_('-')) { +#if UNSIGNED + __set_errno (EINVAL); + return 0; +#else negative = 1; ++s; +#endif } else if (*s == L_('+')) { diff --git a/stdlib/tst-strtol.c b/stdlib/tst-strtol.c index 5c3e2cbb08..af7d41a5d3 100644 --- a/stdlib/tst-strtol.c +++ b/stdlib/tst-strtol.c @@ -1,7 +1,6 @@ /* My bet is this was written by Chris Torek. I reformatted and ansidecl-ized it, and tweaked it a little. */ -#include <ansidecl.h> #include <ctype.h> #include <stdio.h> #include <errno.h> @@ -10,13 +9,13 @@ struct ltest { - CONST char *str; /* Convert this. */ + const char *str; /* Convert this. */ unsigned long int expect; /* To get this. */ int base; /* Use this base. */ char left; /* With this left over. */ int err; /* And this in errno. */ }; -static CONST struct ltest tests[] = +static const struct ltest tests[] = { #if ~0UL == 0xffffffff /* First, signed numbers. */ @@ -38,8 +37,8 @@ static CONST struct ltest tests[] = { " 0", 0, 0, 0, 0 }, { "0xffffffffg", 0xffffffff, 0, 'g', 0 }, { "0xf1f2f3f4f5", 0xffffffff, 0, 0, ERANGE }, - { "-0x123456789", 0xffffffff, 0, 0, ERANGE }, - { "-0xfedcba98", -0xfedcba98, 0, 0, 0 }, + { "-0x123456789", 0, 0, 0, EINVAL }, + { "-0xfedcba98", 0, 0, 0, EINVAL }, { NULL, 0, 0, 0, 0 }, #else /* assume 64 bit long... */ @@ -66,18 +65,18 @@ static CONST struct ltest tests[] = { "0xffffffffg", 0xffffffff, 0, 'g', 0 }, { "0xffffffffffffffffg", 0xffffffffffffffff, 0, 'g', 0 }, { "0xf1f2f3f4f5f6f7f8f9", 0xffffffffffffffff, 0, 0, ERANGE }, - { "-0x123456789abcdef01", 0xffffffffffffffff, 0, 0, ERANGE }, - { "-0xfedcba987654321", -0xfedcba987654321, 0, 0, 0 }, + { "-0x123456789abcdef01", 0, 0, 0, EINVA{ }, + { "-0xfedcba987654321", 0, 0, 0, EINVAL }, { NULL, 0, 0, 0, 0 }, #endif }; -static void EXFUN(expand, (char *dst, int c)); +static void expand __P ((char *dst, int c)); int -DEFUN_VOID(main) +main () { - register CONST struct ltest *lt; + register const struct ltest *lt; char *ep; int status = 0; @@ -145,7 +144,9 @@ DEFUN_VOID(main) } static void -DEFUN(expand, (dst, c), register char *dst AND register int c) +expand (dst, c) + char *dst; + int c; { if (isprint(c)) { |