diff options
author | Roland McGrath <roland@gnu.org> | 1995-03-16 05:32:45 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1995-03-16 05:32:45 +0000 |
commit | f0bf9cb92c28c9ec0ac3376d87055e9d14610082 (patch) | |
tree | c058250695dd90b4eb5b870620826727d559f925 /stdlib/stdlib.h | |
parent | 67a3a8ac7fef11753205c69da9df9c4ef30f6076 (diff) | |
download | glibc-f0bf9cb92c28c9ec0ac3376d87055e9d14610082.tar.gz glibc-f0bf9cb92c28c9ec0ac3376d87055e9d14610082.tar.xz glibc-f0bf9cb92c28c9ec0ac3376d87055e9d14610082.zip |
Thu Mar 16 00:04:41 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* locale/C-ctype.c: New correct data generated by drepper. * Rules: Don't use $(libc.a). Parsing of grouped numbers contributed by Ulrich Drepper. * stdlib/strtol.c (__strtol_internal): Renamed from strtol. Take new flag arg; if nonzero, parse locale-dependent thousands grouping and interpret only the prefix that is correctly grouped. (strtol): Define this to call _strtol_internal with zero for the flag. Use a weak symbol for the definition. * stdlib/strtod.c (strtod, __strtod_internal): Likewise. Check for the exponent of the number overflowing the float format. * stdlib/stdlib.h (__strtof, __strtold): Declarations removed. (__strto{f,d,ld,l,ul,q,uq}_internal): Declare these functions. [__OPTIMIZE__]: Define inline functions calling those. * stdlib/grouping.h: New file, written by drepper. * stdlib/Makefile (distribute): Add grouping.h. * stdio/vfscanf.c: Grok %' modifier to numeric conversions. Call __strtoX_internal with the grouping flag set iff the modifier is present. Wed Mar 15 00:40:54 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/generic/memchr.c: Fix typos: limit.h -> limits.h. * mach/Machrules: Produce static deps for all object flavors. [interface-library]: Remove all these variables and rules. ($(interface-library)-routines): Define this variable. (extra-libs): Append $(interface-library) to this. * mach/Makefile (interface-library): Omit .a suffix. * hurd/Makefile: Likewise. Tue Mar 14 23:40:31 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * stdio/internals.c (flushbuf): If !FLUSH_ONLY, don't skip out early if no new data in buffer after priming. * Makerules (object-suffixes, libtypes): Move all these variables to Makeconfig. * Makeconfig (object-suffixes, libtypes): Moved here from Makerules. * Makerules (build-extra-lib): New canned sequence. * sysdeps/mach/hurd/euidaccess.c: Include fcntl.h. Declare ERR; fix uses of FILE and PORT. Remove bogus weak alias for `access'. * sysdeps/mach/hurd/dirfd.c: Include hurd/fd.h and errno.h. Add missing semicolon. * sysdeps/mach/hurd/opendir.c: Include hurd/fd.h. Use a `struct hurd_fd *' temp var, since DIRP->__fd is a `void *'. * sysdeps/mach/hurd/readdir.c: Include hurd/fd.h. * stdlib/wcstombs.c: #if 0 out code for non-ASCII chars until the locale data format is implemented. * sysdeps/mach/hurd/i386/trampoline.c (_hurd_setup_sighandler): Pass &__sigreturn on the stack to the trampoline code, so it is not position-dependent. * stdio/printf_fp.c (NDEBUG): Define this to disable assert. Don't include <stdarg.h>. (__printf_fp): Last arg ARGS is now `const void **const'; dereference ARGS[0] instead of using va_arg. * locale/setlocale.c: In LC_ALL case, initialize CATEGORY before loop to install data. * locale/loadlocale.c (_nl_category_num_items): Use _NL_ITEM_INDEX to extract number from item code. (_nl_load_locale): Close the descriptor when finished. * malloc/realloc.c (_realloc_internal): Call _malloc_internal in place of malloc. * time/tzfile.c (__tzfile_default): Initialize RULE_STDOFF to zero.
Diffstat (limited to 'stdlib/stdlib.h')
-rw-r--r-- | stdlib/stdlib.h | 52 |
1 files changed, 49 insertions, 3 deletions
diff --git a/stdlib/stdlib.h b/stdlib/stdlib.h index d64a2ffb7c..2a3cf8ec5f 100644 --- a/stdlib/stdlib.h +++ b/stdlib/stdlib.h @@ -78,9 +78,7 @@ extern double strtod __P ((__const char *__nptr, char **__endptr)); #ifdef __USE_GNU /* Likewise for `float' and `long double' sizes of floating-point numbers. */ -extern float __strtof __P ((__const char *__nptr, char **__endptr)); extern float strtof __P ((__const char *__nptr, char **__endptr)); -extern __long_double_t __strtold __P ((__const char *__nptr, char **__endptr)); extern __long_double_t strtold __P ((__const char *__nptr, char **__endptr)); #endif @@ -100,9 +98,57 @@ extern unsigned long long int strtouq __P ((__const char *__nptr, char **__endptr, int __base)); #endif /* GCC and use BSD. */ + +/* The internal entry points for `strtoX' take an extra flag argument + saying whether or not to parse locale-dependent number grouping. */ + +extern double __strtod_internal (__const char *__nptr, + char **__endptr, int __group); +extern float __strtof_internal (__const char *__nptr, char **__endptr, + int __group); +extern __long_double_t __strtold_internal (__const char *__nptr, + char **__endptr, int __group); +extern long int __strtol_internal (__const char *__nptr, char **__endptr, + int __base, int __group); +extern unsigned long int __strtoul_internal (__const char *__nptr, + char **__endptr, int __base, + int __group); +extern long long int __strtoq_internal (__const char *__nptr, char **__endptr, + int __base, int __group); +extern unsigned long long int __strtouq_internal (__const char *__nptr, + char **__endptr, int __base, + int __group); + #if defined (__OPTIMIZE__) && __GNUC__ >= 2 +/* Define inline functions which call the internal entry points. */ + +extern __inline double strtod (__const char *__nptr, char **__endptr) +{ return __strtod_internal (__nptr, __endptr, 0); } +extern __inline long int strtol (__const char *__nptr, + char **__endptr, int __base) +{ return __strtol_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long int strtoul (__const char *__nptr, + char **__endptr, int __base) +{ return __strtoul_internal (__nptr, __endptr, __base, 0); } + +#ifdef __USE_GNU +extern __inline float strtof (__const char *__nptr, char **__endptr) +{ return __strtof_internal (__nptr, __endptr, 0); } +extern __inline __long_double_t strtold (__const char *__nptr, char **__endptr) +{ return __strtold_internal (__nptr, __endptr, 0); } +#endif + +#ifdef __USE_BSD +extern __inline long long int strtoq (__const char *__nptr, char **__endptr, + int __base) +{ return __strtoq_internal (__nptr, __endptr, __base, 0); } +extern __inline unsigned long long int strtouq (__const char *__nptr, + char **__endptr, int __base) +{ return __strtouq_internal (__nptr, __endptr, __base, 0); } +#endif + extern __inline double atof (__const char *__nptr) -{ return strtod(__nptr, (char **) NULL); } +{ return strtod (__nptr, (char **) NULL); } extern __inline int atoi (__const char *__nptr) { return (int) strtol (__nptr, (char **) NULL, 10); } extern __inline long int atol (__const char *__nptr) |