mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
f0be25b633
xlocale.h is already a single-type micro-header, defining struct
__locale_struct and the typedefs __locale_t and locale_t. This patch
brings it into the bits/types/ scheme: there are now
bits/types/__locale_t.h which defines only __locale_struct and
__locale_t, and bits/types/locale_t.h which defines locale_t as well
as the other two. None of *our* headers need __locale_t.h, but it
appears to me that libstdc++ could make use of it.
There are a lot of external uses of xlocale.h, but all the uses I
checked had an autoconf test or equivalent for its existence. It has
never been available from other C libraries, and it has always
contained a comment reading "This file is not standardized, don't rely
on it, it can go away without warning" so I think dropping it is
pretty safe.
I also took the opportunity to clean up comments in various public
header files that still talk about the *_l interfaces as though they
were completely nonstandard. There are a few of them, notably the
strtoX_l and wcstoX_l families, that haven't been standardized, but
the bulk are in POSIX.1-2008.
* locale/xlocale.h: Rename to...
* locale/bits/types/__locale_t.h: ...here. Adjust commentary.
Only define struct __locale_struct and __locale_t, not locale_t.
* locale/bits/types/locale_t.h: New file; define locale_t here.
* locale/Makefile (headers): Update to match.
* include/xlocale.h: Delete wrapper.
* include/bits/types/__locale_t.h: New wrapper.
* include/bits/types/locale_t.h: New wrapper.
* ctype/ctype.h, include/printf.h, include/time.h
* locale/langinfo.h, locale/locale.h, stdlib/monetary.h
* stdlib/stdlib.h, string/string.h, string/strings.h, time/time.h
* wcsmbs/wchar.h, wctype/wctype.h: Use bits/types/locale_t.h.
Correct outdated comments regarding the standardization status of
the functions that take locale_t arguments.
* stdlib/strtod_l.c, stdlib/strtof_l.c, stdlib/strtol_l.c
* stdlib/strtold_l.c, stdlib/strtoul_l.c, stdlib/strtoull_l.c
* sysdeps/ieee754/ldbl-128ibm/strtold_l.c
* sysdeps/ieee754/ldbl-64-128/strtold_l.c
* wcsmbs/wcstod.c, wcsmbs/wcstod_l.c, wcsmbs/wcstof.c
* wcsmbs/wcstof_l.c, wcsmbs/wcstold.c, wcsmbs/wcstold_l.c:
Don't include xlocale.h. If necessary, include locale.h instead.
* stdlib/strtold_l.c: Unconditionally include wchar.h.
149 lines
4.6 KiB
C
149 lines
4.6 KiB
C
/* Copyright (C) 1991-2017 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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _STRINGS_H
|
|
#define _STRINGS_H 1
|
|
|
|
#include <features.h>
|
|
#define __need_size_t
|
|
#include <stddef.h>
|
|
|
|
/* Tell the caller that we provide correct C++ prototypes. */
|
|
#if defined __cplusplus && __GNUC_PREREQ (4, 4)
|
|
# define __CORRECT_ISO_CPP_STRINGS_H_PROTO
|
|
#endif
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#if defined __USE_MISC || !defined __USE_XOPEN2K8
|
|
/* Compare N bytes of S1 and S2 (same as memcmp). */
|
|
extern int bcmp (const void *__s1, const void *__s2, size_t __n)
|
|
__THROW __attribute_pure__ __nonnull ((1, 2));
|
|
|
|
/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */
|
|
extern void bcopy (const void *__src, void *__dest, size_t __n)
|
|
__THROW __nonnull ((1, 2));
|
|
|
|
/* Set N bytes of S to 0. */
|
|
extern void bzero (void *__s, size_t __n) __THROW __nonnull ((1));
|
|
|
|
/* Find the first occurrence of C in S (same as strchr). */
|
|
# ifdef __CORRECT_ISO_CPP_STRINGS_H_PROTO
|
|
extern "C++"
|
|
{
|
|
extern char *index (char *__s, int __c)
|
|
__THROW __asm ("index") __attribute_pure__ __nonnull ((1));
|
|
extern const char *index (const char *__s, int __c)
|
|
__THROW __asm ("index") __attribute_pure__ __nonnull ((1));
|
|
|
|
# if defined __OPTIMIZE__
|
|
__extern_always_inline char *
|
|
index (char *__s, int __c) __THROW
|
|
{
|
|
return __builtin_index (__s, __c);
|
|
}
|
|
|
|
__extern_always_inline const char *
|
|
index (const char *__s, int __c) __THROW
|
|
{
|
|
return __builtin_index (__s, __c);
|
|
}
|
|
# endif
|
|
}
|
|
# else
|
|
extern char *index (const char *__s, int __c)
|
|
__THROW __attribute_pure__ __nonnull ((1));
|
|
# endif
|
|
|
|
/* Find the last occurrence of C in S (same as strrchr). */
|
|
# ifdef __CORRECT_ISO_CPP_STRINGS_H_PROTO
|
|
extern "C++"
|
|
{
|
|
extern char *rindex (char *__s, int __c)
|
|
__THROW __asm ("rindex") __attribute_pure__ __nonnull ((1));
|
|
extern const char *rindex (const char *__s, int __c)
|
|
__THROW __asm ("rindex") __attribute_pure__ __nonnull ((1));
|
|
|
|
# if defined __OPTIMIZE__
|
|
__extern_always_inline char *
|
|
rindex (char *__s, int __c) __THROW
|
|
{
|
|
return __builtin_rindex (__s, __c);
|
|
}
|
|
|
|
__extern_always_inline const char *
|
|
rindex (const char *__s, int __c) __THROW
|
|
{
|
|
return __builtin_rindex (__s, __c);
|
|
}
|
|
# endif
|
|
}
|
|
# else
|
|
extern char *rindex (const char *__s, int __c)
|
|
__THROW __attribute_pure__ __nonnull ((1));
|
|
# endif
|
|
#endif
|
|
|
|
#if defined __USE_MISC || !defined __USE_XOPEN2K8 || defined __USE_XOPEN2K8XSI
|
|
/* Return the position of the first bit set in I, or 0 if none are set.
|
|
The least-significant bit is position 1, the most-significant 32. */
|
|
extern int ffs (int __i) __THROW __attribute_const__;
|
|
#endif
|
|
|
|
/* The following two functions are non-standard but necessary for non-32 bit
|
|
platforms. */
|
|
# ifdef __USE_GNU
|
|
extern int ffsl (long int __l) __THROW __attribute_const__;
|
|
__extension__ extern int ffsll (long long int __ll)
|
|
__THROW __attribute_const__;
|
|
# endif
|
|
|
|
/* Compare S1 and S2, ignoring case. */
|
|
extern int strcasecmp (const char *__s1, const char *__s2)
|
|
__THROW __attribute_pure__ __nonnull ((1, 2));
|
|
|
|
/* Compare no more than N chars of S1 and S2, ignoring case. */
|
|
extern int strncasecmp (const char *__s1, const char *__s2, size_t __n)
|
|
__THROW __attribute_pure__ __nonnull ((1, 2));
|
|
|
|
#ifdef __USE_XOPEN2K8
|
|
/* POSIX.1-2008 extended locale interface (see locale.h). */
|
|
# include <bits/types/locale_t.h>
|
|
|
|
/* Compare S1 and S2, ignoring case, using collation rules from LOC. */
|
|
extern int strcasecmp_l (const char *__s1, const char *__s2, __locale_t __loc)
|
|
__THROW __attribute_pure__ __nonnull ((1, 2, 3));
|
|
|
|
/* Compare no more than N chars of S1 and S2, ignoring case, using
|
|
collation rules from LOC. */
|
|
extern int strncasecmp_l (const char *__s1, const char *__s2,
|
|
size_t __n, __locale_t __loc)
|
|
__THROW __attribute_pure__ __nonnull ((1, 2, 4));
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#if __GNUC_PREREQ (3,4) && __USE_FORTIFY_LEVEL > 0 \
|
|
&& defined __fortify_function
|
|
/* Functions with security checks. */
|
|
# if defined __USE_MISC || !defined __USE_XOPEN2K8
|
|
# include <bits/strings_fortified.h>
|
|
# endif
|
|
#endif
|
|
|
|
#endif /* strings.h */
|