mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-21 04:31:04 +08:00
acd7f096d7
This patch completes the headers cleanup consequent on removal of _BSD_SOURCE and _SVID_SOURCE (apart from any subsequent deprecations): * #endif conditionals that referred to BSD or SVID are updated. * Redundant __USE_* tests in cases involving __USE_MISC are removed. This includes cases such as __USE_MISC || __USE_ISOC99, where __USE_MISC is redundant (because __USE_MISC is only ever defined in the default / _DEFAULT_SOURCE / _GNU_SOURCE case, when __USE_ISOC99 is also defined; the same applies to the non-XSI-extended POSIX versions), and cases involving __USE_GNU, where __USE_GNU is redundant (because if __USE_GNU is defined, so are the other __USE_* macros). There may well be other cases of __USE_FOO || __USE_BAR tests that could be simplified because one macro implies the other; this patch only addresses cases involving __USE_MISC. Tested x86_64. * bits/fcntl.h [__USE_MISC]: Remove redundant conditionals. * bits/sigaction.h [__USE_MISC]: Likewise. * bits/waitstatus.h: Update #endif comments. * ctype/ctype.h: Likewise. * dirent/dirent.h: Likewise. [__USE_MISC]: Remove redundant conditionals. * grp/grp.h: Update #endif comments. [__USE_GNU]: Remove redundant conditionals. [__USE_MISC]: Likewise. * inet/netinet/in.h [__USE_GNU]: Likewise. * io/sys/stat.h [__USE_MISC]: Likewise. * libio/bits/stdio-ldbl.h [__USE_MISC]: Likewise. * libio/bits/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * libio/bits/stdio2.h [__USE_MISC]: Likewise. * libio/stdio.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * math/bits/math-finite.h [__USE_MISC]: Likewise. * math/bits/mathcalls.h [__USE_MISC]: Likewise. * math/math.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. * misc/sys/uio.h: Update #endif comments. * posix/bits/unistd.h [__USE_MISC]: Remove redundant conditionals. * posix/glob.h [__USE_MISC]: Likewise. * posix/sys/types.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/sys/wait.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * posix/unistd.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * pwd/pwd.h [__USE_GNU]: Likewise. [__USE_MISC]: Likewise. * resolv/netdb.h [__USE_GNU]: Likewise. * signal/signal.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * stdlib/stdlib.h: Update #else and #endif comments. [__USE_MISC]: Remove redundant conditionals. [__USE_GNU]: Likewise. * string/bits/string2.h [__USE_MISC]: Likewise. * string/string.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/m68k/m680x0/fpu/bits/mathinline.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/fcntl.h [__USE_MISC]: Likewise. * sysdeps/mach/hurd/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/alpha/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/fcntl-linux.h: Update #endif comments. [__USE_MISC]: Remove redundant conditionals. * sysdeps/unix/sysv/linux/bits/in.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/bits/socket.h [__USE_GNU]: Likewise. * sysdeps/unix/sysv/linux/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/ia64/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/m68k/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/powerpc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/s390/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/sigaction.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/sparc/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/unix/sysv/linux/x86/bits/stat.h [__USE_MISC]: Likewise. * sysdeps/x86/bits/string.h: Update #endif comments. * sysdeps/x86/fpu/bits/mathinline.h [__USE_MISC]: Remove redundant conditionals. * time/sys/time.h: Update #endif comments. * time/time.h: Likewise. [__USE_MISC]: Remove redundant conditionals.
350 lines
11 KiB
C
350 lines
11 KiB
C
/* Copyright (C) 1991-2014 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/>. */
|
|
|
|
/*
|
|
* ISO C99 Standard 7.4: Character handling <ctype.h>
|
|
*/
|
|
|
|
#ifndef _CTYPE_H
|
|
#define _CTYPE_H 1
|
|
|
|
#include <features.h>
|
|
#include <bits/types.h>
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#ifndef _ISbit
|
|
/* These are all the characteristics of characters.
|
|
If there get to be more than 16 distinct characteristics,
|
|
many things must be changed that use `unsigned short int's.
|
|
|
|
The characteristics are stored always in network byte order (big
|
|
endian). We define the bit value interpretations here dependent on the
|
|
machine's byte order. */
|
|
|
|
# include <endian.h>
|
|
# if __BYTE_ORDER == __BIG_ENDIAN
|
|
# define _ISbit(bit) (1 << (bit))
|
|
# else /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
|
# define _ISbit(bit) ((bit) < 8 ? ((1 << (bit)) << 8) : ((1 << (bit)) >> 8))
|
|
# endif
|
|
|
|
enum
|
|
{
|
|
_ISupper = _ISbit (0), /* UPPERCASE. */
|
|
_ISlower = _ISbit (1), /* lowercase. */
|
|
_ISalpha = _ISbit (2), /* Alphabetic. */
|
|
_ISdigit = _ISbit (3), /* Numeric. */
|
|
_ISxdigit = _ISbit (4), /* Hexadecimal numeric. */
|
|
_ISspace = _ISbit (5), /* Whitespace. */
|
|
_ISprint = _ISbit (6), /* Printing. */
|
|
_ISgraph = _ISbit (7), /* Graphical. */
|
|
_ISblank = _ISbit (8), /* Blank (usually SPC and TAB). */
|
|
_IScntrl = _ISbit (9), /* Control character. */
|
|
_ISpunct = _ISbit (10), /* Punctuation. */
|
|
_ISalnum = _ISbit (11) /* Alphanumeric. */
|
|
};
|
|
#endif /* ! _ISbit */
|
|
|
|
/* These are defined in ctype-info.c.
|
|
The declarations here must match those in localeinfo.h.
|
|
|
|
In the thread-specific locale model (see `uselocale' in <locale.h>)
|
|
we cannot use global variables for these as was done in the past.
|
|
Instead, the following accessor functions return the address of
|
|
each variable, which is local to the current thread if multithreaded.
|
|
|
|
These point into arrays of 384, so they can be indexed by any `unsigned
|
|
char' value [0,255]; by EOF (-1); or by any `signed char' value
|
|
[-128,-1). ISO C requires that the ctype functions work for `unsigned
|
|
char' values and for EOF; we also support negative `signed char' values
|
|
for broken old programs. The case conversion arrays are of `int's
|
|
rather than `unsigned char's because tolower (EOF) must be EOF, which
|
|
doesn't fit into an `unsigned char'. But today more important is that
|
|
the arrays are also used for multi-byte character sets. */
|
|
extern const unsigned short int **__ctype_b_loc (void)
|
|
__THROW __attribute__ ((__const__));
|
|
extern const __int32_t **__ctype_tolower_loc (void)
|
|
__THROW __attribute__ ((__const__));
|
|
extern const __int32_t **__ctype_toupper_loc (void)
|
|
__THROW __attribute__ ((__const__));
|
|
|
|
|
|
#ifndef __cplusplus
|
|
# define __isctype(c, type) \
|
|
((*__ctype_b_loc ())[(int) (c)] & (unsigned short int) type)
|
|
#elif defined __USE_EXTERN_INLINES
|
|
# define __isctype_f(type) \
|
|
__extern_inline int \
|
|
is##type (int __c) __THROW \
|
|
{ \
|
|
return (*__ctype_b_loc ())[(int) (__c)] & (unsigned short int) _IS##type; \
|
|
}
|
|
#endif
|
|
|
|
#define __isascii(c) (((c) & ~0x7f) == 0) /* If C is a 7 bit value. */
|
|
#define __toascii(c) ((c) & 0x7f) /* Mask off high bits. */
|
|
|
|
#define __exctype(name) extern int name (int) __THROW
|
|
|
|
__BEGIN_NAMESPACE_STD
|
|
|
|
/* The following names are all functions:
|
|
int isCHARACTERISTIC(int c);
|
|
which return nonzero iff C has CHARACTERISTIC.
|
|
For the meaning of the characteristic names, see the `enum' above. */
|
|
__exctype (isalnum);
|
|
__exctype (isalpha);
|
|
__exctype (iscntrl);
|
|
__exctype (isdigit);
|
|
__exctype (islower);
|
|
__exctype (isgraph);
|
|
__exctype (isprint);
|
|
__exctype (ispunct);
|
|
__exctype (isspace);
|
|
__exctype (isupper);
|
|
__exctype (isxdigit);
|
|
|
|
|
|
/* Return the lowercase version of C. */
|
|
extern int tolower (int __c) __THROW;
|
|
|
|
/* Return the uppercase version of C. */
|
|
extern int toupper (int __c) __THROW;
|
|
|
|
__END_NAMESPACE_STD
|
|
|
|
|
|
/* ISO C99 introduced one new function. */
|
|
#ifdef __USE_ISOC99
|
|
__BEGIN_NAMESPACE_C99
|
|
|
|
__exctype (isblank);
|
|
|
|
__END_NAMESPACE_C99
|
|
#endif
|
|
|
|
#ifdef __USE_GNU
|
|
/* Test C for a set of character classes according to MASK. */
|
|
extern int isctype (int __c, int __mask) __THROW;
|
|
#endif
|
|
|
|
#if defined __USE_MISC || defined __USE_XOPEN
|
|
|
|
/* Return nonzero iff C is in the ASCII set
|
|
(i.e., is no more than 7 bits wide). */
|
|
extern int isascii (int __c) __THROW;
|
|
|
|
/* Return the part of C that is in the ASCII set
|
|
(i.e., the low-order 7 bits of C). */
|
|
extern int toascii (int __c) __THROW;
|
|
|
|
/* These are the same as `toupper' and `tolower' except that they do not
|
|
check the argument for being in the range of a `char'. */
|
|
__exctype (_toupper);
|
|
__exctype (_tolower);
|
|
#endif /* Use X/Open or use misc. */
|
|
|
|
/* This code is needed for the optimized mapping functions. */
|
|
#define __tobody(c, f, a, args) \
|
|
(__extension__ \
|
|
({ int __res; \
|
|
if (sizeof (c) > 1) \
|
|
{ \
|
|
if (__builtin_constant_p (c)) \
|
|
{ \
|
|
int __c = (c); \
|
|
__res = __c < -128 || __c > 255 ? __c : (a)[__c]; \
|
|
} \
|
|
else \
|
|
__res = f args; \
|
|
} \
|
|
else \
|
|
__res = (a)[(int) (c)]; \
|
|
__res; }))
|
|
|
|
#if !defined __NO_CTYPE
|
|
# ifdef __isctype_f
|
|
__isctype_f (alnum)
|
|
__isctype_f (alpha)
|
|
__isctype_f (cntrl)
|
|
__isctype_f (digit)
|
|
__isctype_f (lower)
|
|
__isctype_f (graph)
|
|
__isctype_f (print)
|
|
__isctype_f (punct)
|
|
__isctype_f (space)
|
|
__isctype_f (upper)
|
|
__isctype_f (xdigit)
|
|
# ifdef __USE_ISOC99
|
|
__isctype_f (blank)
|
|
# endif
|
|
# elif defined __isctype
|
|
# define isalnum(c) __isctype((c), _ISalnum)
|
|
# define isalpha(c) __isctype((c), _ISalpha)
|
|
# define iscntrl(c) __isctype((c), _IScntrl)
|
|
# define isdigit(c) __isctype((c), _ISdigit)
|
|
# define islower(c) __isctype((c), _ISlower)
|
|
# define isgraph(c) __isctype((c), _ISgraph)
|
|
# define isprint(c) __isctype((c), _ISprint)
|
|
# define ispunct(c) __isctype((c), _ISpunct)
|
|
# define isspace(c) __isctype((c), _ISspace)
|
|
# define isupper(c) __isctype((c), _ISupper)
|
|
# define isxdigit(c) __isctype((c), _ISxdigit)
|
|
# ifdef __USE_ISOC99
|
|
# define isblank(c) __isctype((c), _ISblank)
|
|
# endif
|
|
# endif
|
|
|
|
# ifdef __USE_EXTERN_INLINES
|
|
__extern_inline int
|
|
__NTH (tolower (int __c))
|
|
{
|
|
return __c >= -128 && __c < 256 ? (*__ctype_tolower_loc ())[__c] : __c;
|
|
}
|
|
|
|
__extern_inline int
|
|
__NTH (toupper (int __c))
|
|
{
|
|
return __c >= -128 && __c < 256 ? (*__ctype_toupper_loc ())[__c] : __c;
|
|
}
|
|
# endif
|
|
|
|
# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
|
|
# define tolower(c) __tobody (c, tolower, *__ctype_tolower_loc (), (c))
|
|
# define toupper(c) __tobody (c, toupper, *__ctype_toupper_loc (), (c))
|
|
# endif /* Optimizing gcc */
|
|
|
|
# if defined __USE_MISC || defined __USE_XOPEN
|
|
# define isascii(c) __isascii (c)
|
|
# define toascii(c) __toascii (c)
|
|
|
|
# define _tolower(c) ((int) (*__ctype_tolower_loc ())[(int) (c)])
|
|
# define _toupper(c) ((int) (*__ctype_toupper_loc ())[(int) (c)])
|
|
# endif
|
|
|
|
#endif /* Not __NO_CTYPE. */
|
|
|
|
|
|
#ifdef __USE_XOPEN2K8
|
|
/* The concept of one static locale per category is not very well
|
|
thought out. Many applications will need to process its data using
|
|
information from several different locales. Another application is
|
|
the implementation of the internationalization handling in the
|
|
upcoming ISO C++ standard library. To support this another set of
|
|
the functions using locale data exist which have an additional
|
|
argument.
|
|
|
|
Attention: all these functions are *not* standardized in any form.
|
|
This is a proof-of-concept implementation. */
|
|
|
|
/* Structure for reentrant locale using functions. This is an
|
|
(almost) opaque type for the user level programs. */
|
|
# include <xlocale.h>
|
|
|
|
/* These definitions are similar to the ones above but all functions
|
|
take as an argument a handle for the locale which shall be used. */
|
|
# define __isctype_l(c, type, locale) \
|
|
((locale)->__ctype_b[(int) (c)] & (unsigned short int) type)
|
|
|
|
# define __exctype_l(name) \
|
|
extern int name (int, __locale_t) __THROW
|
|
|
|
/* The following names are all functions:
|
|
int isCHARACTERISTIC(int c, locale_t *locale);
|
|
which return nonzero iff C has CHARACTERISTIC.
|
|
For the meaning of the characteristic names, see the `enum' above. */
|
|
__exctype_l (isalnum_l);
|
|
__exctype_l (isalpha_l);
|
|
__exctype_l (iscntrl_l);
|
|
__exctype_l (isdigit_l);
|
|
__exctype_l (islower_l);
|
|
__exctype_l (isgraph_l);
|
|
__exctype_l (isprint_l);
|
|
__exctype_l (ispunct_l);
|
|
__exctype_l (isspace_l);
|
|
__exctype_l (isupper_l);
|
|
__exctype_l (isxdigit_l);
|
|
|
|
__exctype_l (isblank_l);
|
|
|
|
|
|
/* Return the lowercase version of C in locale L. */
|
|
extern int __tolower_l (int __c, __locale_t __l) __THROW;
|
|
extern int tolower_l (int __c, __locale_t __l) __THROW;
|
|
|
|
/* Return the uppercase version of C. */
|
|
extern int __toupper_l (int __c, __locale_t __l) __THROW;
|
|
extern int toupper_l (int __c, __locale_t __l) __THROW;
|
|
|
|
# if __GNUC__ >= 2 && defined __OPTIMIZE__ && !defined __cplusplus
|
|
# define __tolower_l(c, locale) \
|
|
__tobody (c, __tolower_l, (locale)->__ctype_tolower, (c, locale))
|
|
# define __toupper_l(c, locale) \
|
|
__tobody (c, __toupper_l, (locale)->__ctype_toupper, (c, locale))
|
|
# define tolower_l(c, locale) __tolower_l ((c), (locale))
|
|
# define toupper_l(c, locale) __toupper_l ((c), (locale))
|
|
# endif /* Optimizing gcc */
|
|
|
|
|
|
# ifndef __NO_CTYPE
|
|
# define __isalnum_l(c,l) __isctype_l((c), _ISalnum, (l))
|
|
# define __isalpha_l(c,l) __isctype_l((c), _ISalpha, (l))
|
|
# define __iscntrl_l(c,l) __isctype_l((c), _IScntrl, (l))
|
|
# define __isdigit_l(c,l) __isctype_l((c), _ISdigit, (l))
|
|
# define __islower_l(c,l) __isctype_l((c), _ISlower, (l))
|
|
# define __isgraph_l(c,l) __isctype_l((c), _ISgraph, (l))
|
|
# define __isprint_l(c,l) __isctype_l((c), _ISprint, (l))
|
|
# define __ispunct_l(c,l) __isctype_l((c), _ISpunct, (l))
|
|
# define __isspace_l(c,l) __isctype_l((c), _ISspace, (l))
|
|
# define __isupper_l(c,l) __isctype_l((c), _ISupper, (l))
|
|
# define __isxdigit_l(c,l) __isctype_l((c), _ISxdigit, (l))
|
|
|
|
# define __isblank_l(c,l) __isctype_l((c), _ISblank, (l))
|
|
|
|
# ifdef __USE_MISC
|
|
# define __isascii_l(c,l) ((l), __isascii (c))
|
|
# define __toascii_l(c,l) ((l), __toascii (c))
|
|
# endif
|
|
|
|
# define isalnum_l(c,l) __isalnum_l ((c), (l))
|
|
# define isalpha_l(c,l) __isalpha_l ((c), (l))
|
|
# define iscntrl_l(c,l) __iscntrl_l ((c), (l))
|
|
# define isdigit_l(c,l) __isdigit_l ((c), (l))
|
|
# define islower_l(c,l) __islower_l ((c), (l))
|
|
# define isgraph_l(c,l) __isgraph_l ((c), (l))
|
|
# define isprint_l(c,l) __isprint_l ((c), (l))
|
|
# define ispunct_l(c,l) __ispunct_l ((c), (l))
|
|
# define isspace_l(c,l) __isspace_l ((c), (l))
|
|
# define isupper_l(c,l) __isupper_l ((c), (l))
|
|
# define isxdigit_l(c,l) __isxdigit_l ((c), (l))
|
|
|
|
# define isblank_l(c,l) __isblank_l ((c), (l))
|
|
|
|
# ifdef __USE_MISC
|
|
# define isascii_l(c,l) __isascii_l ((c), (l))
|
|
# define toascii_l(c,l) __toascii_l ((c), (l))
|
|
# endif
|
|
|
|
# endif /* Not __NO_CTYPE. */
|
|
|
|
#endif /* Use POSIX 2008. */
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* ctype.h */
|