JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Be namespace clean in ctype.h. 

* libc/include/ctype.h (_tolower, _toupper, isalpha, isupper)
(islower, isdigit, isxdigit, isspace, ispunct, isalnum)
(isprint, isgraph, iscntrl, isblank, toupper, tolower)
(isascii, toascii): Don't use 'c' as macro parameter name.
This commit is contained in:
Eric Blake 2009-04-24 12:27:36 +00:00
parent 1335bf3c5d
commit 190ccfc18c
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
newlib/ChangeLog
View File

@ -1,5 +1,11 @@
2009-04-24 Eric Blake <ebb9@byu.net> 2009-04-24 Eric Blake <ebb9@byu.net>
Be namespace clean in ctype.h.
* libc/include/ctype.h (_tolower, _toupper, isalpha, isupper)
(islower, isdigit, isxdigit, isspace, ispunct, isalnum)
(isprint, isgraph, iscntrl, isblank, toupper, tolower)
(isascii, toascii): Don't use 'c' as macro parameter name.
Trigger gcc warning if isFoo macros are called with plain char. Trigger gcc warning if isFoo macros are called with plain char.
* libc/include/ctype.h (isalpha, isupper, islower, isdigit) * libc/include/ctype.h (isalpha, isupper, islower, isdigit)
(isxdigit, isspace, ispunct, isalnum, isprint, isgraph) (isxdigit, isspace, ispunct, isalnum, isprint, isgraph)

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

@ -26,8 +26,8 @@ int _EXFUN(isblank, (int __c));
#ifndef __STRICT_ANSI__ #ifndef __STRICT_ANSI__
int _EXFUN(isascii, (int __c)); int _EXFUN(isascii, (int __c));
int _EXFUN(toascii, (int __c)); int _EXFUN(toascii, (int __c));
#define _tolower(c) ((unsigned char)(c) - 'A' + 'a') #define _tolower(__c) ((unsigned char)(__c) - 'A' + 'a')
#define _toupper(c) ((unsigned char)(c) - 'a' + 'A') #define _toupper(__c) ((unsigned char)(__c) - 'a' + 'A')
#endif #endif
#define _U 01 #define _U 01
@ -48,23 +48,23 @@ extern __IMPORT char *__ctype_ptr__;
/* These macros are intentionally written in a manner that will trigger /* These macros are intentionally written in a manner that will trigger
a gcc -Wall warning if the user mistakenly passes a 'char' instead a gcc -Wall warning if the user mistakenly passes a 'char' instead
of an int containing an 'unsigned char'. */ of an int containing an 'unsigned char'. */
#define isalpha(c) ((__ctype_ptr__+1)[c]&(_U|_L)) #define isalpha(__c) ((__ctype_ptr__+1)[__c]&(_U|_L))
#define isupper(c) (((__ctype_ptr__+1)[c]&(_U|_L))==_U) #define isupper(__c) (((__ctype_ptr__+1)[__c]&(_U|_L))==_U)
#define islower(c) (((__ctype_ptr__+1)[c]&(_U|_L))==_L) #define islower(__c) (((__ctype_ptr__+1)[__c]&(_U|_L))==_L)
#define isdigit(c) ((__ctype_ptr__+1)[c]&_N) #define isdigit(__c) ((__ctype_ptr__+1)[__c]&_N)
#define isxdigit(c) ((__ctype_ptr__+1)[c]&(_X|_N)) #define isxdigit(__c) ((__ctype_ptr__+1)[__c]&(_X|_N))
#define isspace(c) ((__ctype_ptr__+1)[c]&_S) #define isspace(__c) ((__ctype_ptr__+1)[__c]&_S)
#define ispunct(c) ((__ctype_ptr__+1)[c]&_P) #define ispunct(__c) ((__ctype_ptr__+1)[__c]&_P)
#define isalnum(c) ((__ctype_ptr__+1)[c]&(_U|_L|_N)) #define isalnum(__c) ((__ctype_ptr__+1)[__c]&(_U|_L|_N))
#define isprint(c) ((__ctype_ptr__+1)[c]&(_P|_U|_L|_N|_B)) #define isprint(__c) ((__ctype_ptr__+1)[__c]&(_P|_U|_L|_N|_B))
#define isgraph(c) ((__ctype_ptr__+1)[c]&(_P|_U|_L|_N)) #define isgraph(__c) ((__ctype_ptr__+1)[__c]&(_P|_U|_L|_N))
#define iscntrl(c) ((__ctype_ptr__+1)[c]&_C) #define iscntrl(__c) ((__ctype_ptr__+1)[__c]&_C)
#if defined(__GNUC__) && \ #if defined(__GNUC__) && \
(!defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901L) (!defined(__STRICT_ANSI__) || __STDC_VERSION__ >= 199901L)
#define isblank(c) \ #define isblank(__c) \
__extension__ ({ __typeof__ (c) __c = (c); \ __extension__ ({ __typeof__ (__c) __x = (__c); \
((__ctype_ptr__+1)[__c]&_B) || (__c) == '\t';}) ((__ctype_ptr__+1)[__x]&_B) || (__x) == '\t';})
#endif #endif
@ -72,18 +72,18 @@ extern __IMPORT char *__ctype_ptr__;
slightly slower. These macros are not NLS-aware so they are slightly slower. These macros are not NLS-aware so they are
disabled if the system supports the extended character sets. */ disabled if the system supports the extended character sets. */
# if defined(__GNUC__) && !defined (_MB_EXTENDED_CHARSETS_ISO) && !defined (_MB_EXTENDED_CHARSETS_WINDOWS) # if defined(__GNUC__) && !defined (_MB_EXTENDED_CHARSETS_ISO) && !defined (_MB_EXTENDED_CHARSETS_WINDOWS)
# define toupper(c) \ # define toupper(__c) \
__extension__ ({ __typeof__ (c) __x = (c); \ __extension__ ({ __typeof__ (__c) __x = (__c); \
islower(__x) ? (__x - 'a' + 'A') : __x;}) islower(__x) ? (__x - 'a' + 'A') : __x;})
# define tolower(c) \ # define tolower(__c) \
__extension__ ({ __typeof__ (c) __x = (c); \ __extension__ ({ __typeof__ (__c) __x = (__c); \
isupper(__x) ? (__x - 'A' + 'a') : __x;}) isupper(__x) ? (__x - 'A' + 'a') : __x;})
#endif #endif
#endif /* !__cplusplus */ #endif /* !__cplusplus */
#ifndef __STRICT_ANSI__ #ifndef __STRICT_ANSI__
#define isascii(c) ((unsigned)(c)<=0177) #define isascii(__c) ((unsigned)(__c)<=0177)
#define toascii(c) ((c)&0177) #define toascii(__c) ((__c)&0177)
#endif #endif
/* For C++ backward-compatibility only. */ /* For C++ backward-compatibility only. */