mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
ccadf7b534
2004-03-14 Ulrich Drepper <drepper@redhat.com> Make the non-_l functions wrappers around the _l functions. * include/monetary.h: Declare __vstrmon_l. * include/string.h: Add libc_hidden_proto for __strcoll_l and __strxfrm_l. * include/time.h: Define ptime_locale_status. Declare __strptime_internal. * include/wchar.h: Add libc_hidden_proto for __wcscoll_l and __wcsxfrm_l. * stdlib/strfmon.c: Move the code to strfmon_l.c. Add little wrapper around __vstrfmon_l. * stdlib/strfmon_l.c: Add real implementation. Split into new function __vstrfmon_l to allow calling it from strfmon. * stdlib/strtod.c: Move real code to strtod_l.c and add wrapper. * stdlib/strtod_l.c: Add real implementation. * stdlib/strtof.c: Adjust to changed strtod.c. * stdlib/strtof_l.c: Include strtod_l.c now. * stdlib/strtold.c: New file. * stdlib/strtold_l.c: Removed. * string/strcoll.c: Move real code to strcoll_l.c: Add wrapper. * string/strcoll_l.c: Add real implementation. * string/strxfrm.c: Move real code to strxfrm_l.c: Add wrapper. * string/strxfrm_l.c: Add real implementation. * sysdeps/generic/strtol.c: Move real implementation to strtol_l.c. Add wrappers. * sysdeps/generic/strtol_l.c: Add real implementation. * sysdeps/generic/strtold.c: Removed. * sysdeps/generic/strtold_l.c: New file. * sysdeps/generic/strtoll_l.c: Include strtol_l.c now. Adjust #defines. * sysdeps/generic/strtoul_l.c: Likewise. * sysdeps/generic/strtoull_l.c: Likewise. * sysdeps/generic/wcstol_l.c: Likewise. * sysdeps/generic/wcstoll_l.c: Likewise. * sysdeps/generic/wcstoul_l.c: Likewise. * sysdeps/generic/wcstoull_l.c: Likewise. * sysdeps/ieee754/ldbl-128/strtold.c: Removed. * sysdeps/ieee754/ldbl-128/strtold_l.c: New file. * sysdeps/ieee754/ldbl-96/strtold.c: Removed. * sysdeps/ieee754/ldbl-96/strtold_l.c: New file. * sysdeps/m68k/strtold.c: Removed. * sysdeps/m68k/strtold_l.c: New file. * time/strftime.c: Move real code to strftime_l.c. Add wrapper. * time/strftime_l.c: Add real implementation. * time/strptime.c: Move real code to strptime_l.c. Add wrapper. * time/strptime_l.c: Add real implementation. * time/wcsftime.c: Simplify since only wrappers are defined in strftime.c. * time/wcsftime_l.c: Include strftime_l.c. * wcsmbs/wcscoll.c: Simplify since the file is not used by wcscoll_l.c anymore. * wcsmbs/wcscoll_l.c: Include strcoll_l.c. * wcsmbs/wcsxfrm.c: Simplify since the file is not used by wcsxfrm_l.c anymore. * wcsmbs/wcsxfrm_l.c: Include strxfrm_l.c. * wcsmbs/wcstod.c: Prepare to include new strtod.c. * wcsmbs/wcstod_l.c: Include strtod_l.c. * wcsmbs/wcstof.c: Prepare to include new strtof.c. * wcsmbs/wcstof_l.c: Include strtof_l.c. * wcsmbs/wcstold.c: Prepare to include new strtold.c. * wcsmbs/wcstold_l.c: Include strtold_l.c. * locale/uselocale.c: Use _NL_CURRENT_LOCALE instead of __libc_tsd_get. * sysdeps/generic/strcasecmp.c: Optimize a bit. It's better to get a reference to the current locale and then use the _l functions. * sysdeps/generic/strncase.c: Likewise.
112 lines
2.6 KiB
C
112 lines
2.6 KiB
C
/* Convert string representation of a number into an integer value.
|
|
Copyright (C) 1991,92,94,95,96,97,98,99,2000,2001,2002,2003,2004
|
|
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 Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 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
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <stdlib.h>
|
|
#include <wchar.h>
|
|
#include <locale/localeinfo.h>
|
|
|
|
#ifndef UNSIGNED
|
|
# define UNSIGNED 0
|
|
# define INT LONG int
|
|
#else
|
|
# define INT unsigned LONG int
|
|
#endif
|
|
|
|
#if UNSIGNED
|
|
# ifdef USE_WIDE_CHAR
|
|
# ifdef QUAD
|
|
# define strtol wcstoull
|
|
# define __strtol_l __wcstoull_l
|
|
# else
|
|
# define strtol wcstoul
|
|
# define __strtol_l __wcstoul_l
|
|
# endif
|
|
# else
|
|
# ifdef QUAD
|
|
# define strtol strtoull
|
|
# define __strtol_l __strtoull_l
|
|
# else
|
|
# define strtol strtoul
|
|
# define __strtol_l __strtoul_l
|
|
# endif
|
|
# endif
|
|
#else
|
|
# ifdef USE_WIDE_CHAR
|
|
# ifdef QUAD
|
|
# define strtol wcstoll
|
|
# define __strtol_l __wcstoll_l
|
|
# else
|
|
# define strtol wcstol
|
|
# define __strtol_l __wcstol_l
|
|
# endif
|
|
# else
|
|
# ifdef QUAD
|
|
# define strtol strtoll
|
|
# define __strtol_l __strtoll_l
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
|
|
/* If QUAD is defined, we are defining `strtoll' or `strtoull',
|
|
operating on `long long int's. */
|
|
#ifdef QUAD
|
|
# define LONG long long
|
|
#else
|
|
# define LONG long
|
|
#endif
|
|
|
|
|
|
#ifdef USE_WIDE_CHAR
|
|
# define STRING_TYPE wchar_t
|
|
#else
|
|
# define STRING_TYPE char
|
|
#endif
|
|
|
|
|
|
#define INTERNAL(X) INTERNAL1(X)
|
|
#define INTERNAL1(X) __##X##_internal
|
|
|
|
|
|
extern INT INTERNAL (__strtol_l) (const STRING_TYPE *, STRING_TYPE **, int,
|
|
int, __locale_t);
|
|
|
|
|
|
INT
|
|
INTERNAL (strtol) (nptr, endptr, base, group)
|
|
const STRING_TYPE *nptr;
|
|
STRING_TYPE **endptr;
|
|
int base;
|
|
int group;
|
|
{
|
|
return INTERNAL (__strtol_l) (nptr, endptr, base, group, _NL_CURRENT_LOCALE);
|
|
}
|
|
libc_hidden_def (INTERNAL (strtol))
|
|
|
|
|
|
INT
|
|
strtol (nptr, endptr, base)
|
|
const STRING_TYPE *nptr;
|
|
STRING_TYPE **endptr;
|
|
int base;
|
|
{
|
|
return INTERNAL (__strtol_l) (nptr, endptr, base, 0, _NL_CURRENT_LOCALE);
|
|
}
|