libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-18 23:12:15 +08:00
Code Issues Projects Releases Wiki Activity

Revert "ctype: use less short names in public header"

Browse Source 
This patch fixed a problem which isn't in newlib, but in projects
incorrectly using symbols from the reserved namespace.

This reverts commit 3ba1bd0d9dbc015c14a0aaafcef042f706d1249a.
This commit is contained in:
Corinna Vinschen 2021-12-02 11:21:14 +01:00
parent 8dd641f236
commit dbc7d28ba9
24 changed files with 56 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
newlib/libc/ctype/ctype_.h
View File

@ -1,15 +1,5 @@
#include <ctype.h>
/* Define some short names to keep internal files shorter. */
#define _U _ISupper
#define _L _ISlower
#define _N _ISdigit
#define _S _ISspace
#define _P _ISpunct
#define _C _IScntrl
#define _X _ISxdigit
#define _B _ISblank
#if (defined(__GNUC__) && !defined(__CHAR_UNSIGNED__) && !defined(COMPACT_CTYPE)) || defined (__CYGWIN__)
#define ALLOW_NEGATIVE_CTYPE_INDEX
#endif

2
newlib/libc/ctype/isalnum.c
View File

@ -46,5 +46,5 @@ No OS subroutines are required.
int
isalnum (int c)
{
return(__CTYPE_PTR[c+1] & (_ISupper|_ISlower|_ISdigit));
return(__CTYPE_PTR[c+1] & (_U|_L|_N));
}

2
newlib/libc/ctype/isalnum_l.c
View File

@ -6,5 +6,5 @@
int
isalnum_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower|_ISdigit);
return __locale_ctype_ptr_l (locale)[c+1] & (_U|_L|_N);
}

2
newlib/libc/ctype/isalpha.c
View File

@ -45,5 +45,5 @@ No supporting OS subroutines are required.
int
isalpha (int c)
{
return(__CTYPE_PTR[c+1] & (_ISupper|_ISlower));
return(__CTYPE_PTR[c+1] & (_U|_L));
}

2
newlib/libc/ctype/isalpha_l.c
View File

@ -6,5 +6,5 @@
int
isalpha_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower);
return __locale_ctype_ptr_l (locale)[c+1] & (_U|_L);
}

2
newlib/libc/ctype/isblank.c
View File

@ -44,5 +44,5 @@ No supporting OS subroutines are required.
int
isblank (int c)
{
return ((__CTYPE_PTR[c+1] & _ISblank) || (c == '\t'));
return ((__CTYPE_PTR[c+1] & _B) || (c == '\t'));
}

2
newlib/libc/ctype/isblank_l.c
View File

@ -6,5 +6,5 @@
int
isblank_l (int c, struct __locale_t *locale)
{
return (__locale_ctype_ptr_l (locale)[c+1] & _ISblank) || (c == '\t');
return (__locale_ctype_ptr_l (locale)[c+1] & _B) || (c == '\t');
}

2
newlib/libc/ctype/iscntrl.c
View File

@ -48,5 +48,5 @@ No supporting OS subroutines are required.
int
iscntrl (int c)
{
return(__CTYPE_PTR[c+1] & _IScntrl);
return(__CTYPE_PTR[c+1] & _C);
}

2
newlib/libc/ctype/iscntrl_l.c
View File

@ -6,5 +6,5 @@
int
iscntrl_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & _IScntrl;
return __locale_ctype_ptr_l (locale)[c+1] & _C;
}

2
newlib/libc/ctype/isdigit.c
View File

@ -47,5 +47,5 @@ No supporting OS subroutines are required.
int
isdigit (int c)
{
return(__CTYPE_PTR[c+1] & _ISdigit);
return(__CTYPE_PTR[c+1] & _N);
}

2
newlib/libc/ctype/isdigit_l.c
View File

@ -6,5 +6,5 @@
int
isdigit_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & _ISdigit;
return __locale_ctype_ptr_l (locale)[c+1] & _N;
}

2
newlib/libc/ctype/islower.c
View File

@ -45,5 +45,5 @@ No supporting OS subroutines are required.
int
islower (int c)
{
return ((__CTYPE_PTR[c+1] & (_ISupper|_ISlower)) == _ISlower);
return ((__CTYPE_PTR[c+1] & (_U|_L)) == _L);
}

2
newlib/libc/ctype/islower_l.c
View File

@ -6,5 +6,5 @@
int
islower_l (int c, struct __locale_t *locale)
{
return (__locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower)) == _ISlower;
return (__locale_ctype_ptr_l (locale)[c+1] & (_U|_L)) == _L;
}

4
newlib/libc/ctype/isprint.c
View File

@ -59,7 +59,7 @@ No supporting OS subroutines are required.
int
isgraph (int c)
{
return(__CTYPE_PTR[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit));
return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N));
}
@ -67,5 +67,5 @@ isgraph (int c)
int
isprint (int c)
{
return(__CTYPE_PTR[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank));
return(__CTYPE_PTR[c+1] & (_P|_U|_L|_N|_B));
}

4
newlib/libc/ctype/isprint_l.c
View File

@ -6,7 +6,7 @@
int
isgraph_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit);
return __locale_ctype_ptr_l (locale)[c+1] & (_P|_U|_L|_N);
}
#undef isprint_l
@ -14,5 +14,5 @@ isgraph_l (int c, struct __locale_t *locale)
int
isprint_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank);
return __locale_ctype_ptr_l (locale)[c+1] & (_P|_U|_L|_N|_B);
}

2
newlib/libc/ctype/ispunct.c
View File

@ -47,5 +47,5 @@ No supporting OS subroutines are required.
int
ispunct (int c)
{
return(__CTYPE_PTR[c+1] & _ISpunct);
return(__CTYPE_PTR[c+1] & _P);
}

2
newlib/libc/ctype/ispunct_l.c
View File

@ -6,6 +6,6 @@
int
ispunct_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & _ISpunct;
return __locale_ctype_ptr_l (locale)[c+1] & _P;
}

2
newlib/libc/ctype/isspace.c
View File

@ -46,5 +46,5 @@ No supporting OS subroutines are required.
int
isspace (int c)
{
return(__CTYPE_PTR[c+1] & _ISspace);
return(__CTYPE_PTR[c+1] & _S);
}

2
newlib/libc/ctype/isspace_l.c
View File

@ -6,6 +6,6 @@
int
isspace_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & _ISspace;
return __locale_ctype_ptr_l (locale)[c+1] & _S;
}

2
newlib/libc/ctype/isupper.c
View File

@ -43,5 +43,5 @@ No supporting OS subroutines are required.
int
isupper (int c)
{
return ((__CTYPE_PTR[c+1] & (_ISupper|_ISlower)) == _ISupper);
return ((__CTYPE_PTR[c+1] & (_U|_L)) == _U);
}

2
newlib/libc/ctype/isupper_l.c
View File

@ -6,6 +6,6 @@
int
isupper_l (int c, struct __locale_t *locale)
{
return (__locale_ctype_ptr_l (locale)[c+1] & (_ISupper|_ISlower)) == _ISupper;
return (__locale_ctype_ptr_l (locale)[c+1] & (_U|_L)) == _U;
}

2
newlib/libc/ctype/isxdigit.c
View File

@ -46,5 +46,5 @@ No supporting OS subroutines are required.
int
isxdigit (int c)
{
return(__CTYPE_PTR[c+1] & ((_ISxdigit)|(_ISdigit)));
return(__CTYPE_PTR[c+1] & ((_X)|(_N)));
}

2
newlib/libc/ctype/isxdigit_l.c
View File

@ -6,6 +6,6 @@
int
isxdigit_l (int c, struct __locale_t *locale)
{
return __locale_ctype_ptr_l (locale)[c+1] & ((_ISxdigit)|(_ISdigit));
return __locale_ctype_ptr_l (locale)[c+1] & ((_X)|(_N));
}

67
newlib/libc/include/ctype.h
View File

@ -57,17 +57,14 @@ extern int isascii_l (int __c, locale_t __l);
extern int toascii_l (int __c, locale_t __l);
#endif
enum
{
_ISupper = 01,
_ISlower = 02,
_ISdigit = 04,
_ISspace = 010,
_ISpunct = 020,
_IScntrl = 040,
_ISxdigit = 0100,
_ISblank = 0200,
};
#define _U 01
#define _L 02
#define _N 04
#define _S 010
#define _P 020
#define _C 040
#define _X 0100
#define _B 0200
/* For C++ backward-compatibility only. */
extern __IMPORT const char _ctype_[];
@ -92,22 +89,22 @@ const char *__locale_ctype_ptr (void);
an out-of-bounds reference on a 64-bit machine. */
#define __ctype_lookup(__c) ((__CTYPE_PTR+sizeof(""[__c]))[(int)(__c)])
#define isalpha(__c) (__ctype_lookup(__c) & (_ISupper|_ISlower))
#define isupper(__c) ((__ctype_lookup(__c) & (_ISupper|_ISlower)) == _ISupper)
#define islower(__c) ((__ctype_lookup(__c) & (_ISupper|_ISlower)) == _ISlower)
#define isdigit(__c) (__ctype_lookup(__c) & _ISdigit)
#define isxdigit(__c) (__ctype_lookup(__c) & (_ISxdigit|_ISdigit))
#define isspace(__c) (__ctype_lookup(__c) & _ISspace)
#define ispunct(__c) (__ctype_lookup(__c) & _ISpunct)
#define isalnum(__c) (__ctype_lookup(__c) & (_ISupper|_ISlower|_ISdigit))
#define isprint(__c) (__ctype_lookup(__c) & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank))
#define isgraph(__c) (__ctype_lookup(__c) & (_ISpunct|_ISupper|_ISlower|_ISdigit))
#define iscntrl(__c) (__ctype_lookup(__c) & _IScntrl)
#define isalpha(__c) (__ctype_lookup(__c)&(_U|_L))
#define isupper(__c) ((__ctype_lookup(__c)&(_U|_L))==_U)
#define islower(__c) ((__ctype_lookup(__c)&(_U|_L))==_L)
#define isdigit(__c) (__ctype_lookup(__c)&_N)
#define isxdigit(__c) (__ctype_lookup(__c)&(_X|_N))
#define isspace(__c) (__ctype_lookup(__c)&_S)
#define ispunct(__c) (__ctype_lookup(__c)&_P)
#define isalnum(__c) (__ctype_lookup(__c)&(_U|_L|_N))
#define isprint(__c) (__ctype_lookup(__c)&(_P|_U|_L|_N|_B))
#define isgraph(__c) (__ctype_lookup(__c)&(_P|_U|_L|_N))
#define iscntrl(__c) (__ctype_lookup(__c)&_C)
#if defined(__GNUC__) && __ISO_C_VISIBLE >= 1999
#define isblank(__c) \
__extension__ ({ __typeof__ (__c) __x = (__c); \
(__ctype_lookup(__x)&_ISblank) || (int) (__x) == '\t';})
(__ctype_lookup(__x)&_B) || (int) (__x) == '\t';})
#endif
#if __POSIX_VISIBLE >= 200809
@ -123,22 +120,22 @@ __locale_ctype_ptr_l(locale_t _l)
#endif
#define __ctype_lookup_l(__c,__l) ((__locale_ctype_ptr_l(__l)+sizeof(""[__c]))[(int)(__c)])
#define isalpha_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower))
#define isupper_l(__c,__l) ((__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower)) == _ISupper)
#define islower_l(__c,__l) ((__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower)) == _ISlower)
#define isdigit_l(__c,__l) (__ctype_lookup_l(__c,__l) & _ISdigit)
#define isxdigit_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISxdigit|_ISdigit))
#define isspace_l(__c,__l) (__ctype_lookup_l(__c,__l) & _ISspace)
#define ispunct_l(__c,__l) (__ctype_lookup_l(__c,__l) & _ISpunct)
#define isalnum_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISupper|_ISlower|_ISdigit))
#define isprint_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISpunct|_ISupper|_ISlower|_ISdigit|_ISblank))
#define isgraph_l(__c,__l) (__ctype_lookup_l(__c,__l) & (_ISpunct|_ISupper|_ISlower|_ISdigit))
#define iscntrl_l(__c,__l) (__ctype_lookup_l(__c,__l) & _IScntrl)
#define isalpha_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_U|_L))
#define isupper_l(__c,__l) ((__ctype_lookup_l(__c,__l)&(_U|_L))==_U)
#define islower_l(__c,__l) ((__ctype_lookup_l(__c,__l)&(_U|_L))==_L)
#define isdigit_l(__c,__l) (__ctype_lookup_l(__c,__l)&_N)
#define isxdigit_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_X|_N))
#define isspace_l(__c,__l) (__ctype_lookup_l(__c,__l)&_S)
#define ispunct_l(__c,__l) (__ctype_lookup_l(__c,__l)&_P)
#define isalnum_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_U|_L|_N))
#define isprint_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_P|_U|_L|_N|_B))
#define isgraph_l(__c,__l) (__ctype_lookup_l(__c,__l)&(_P|_U|_L|_N))
#define iscntrl_l(__c,__l) (__ctype_lookup_l(__c,__l)&_C)
#if defined(__GNUC__)
#define isblank_l(__c, __l) \
__extension__ ({ __typeof__ (__c) __x = (__c); \
(__ctype_lookup_l(__x,__l)&_ISblank) || (int) (__x) == '\t';})
(__ctype_lookup_l(__x,__l)&_B) || (int) (__x) == '\t';})
#endif
#endif /* __POSIX_VISIBLE >= 200809 */