diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-27 10:19:19 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-27 10:19:19 +0000 |
| commit | cf578c75a521e1f35a9f07ca04c0cd678209c79f (patch) | |
| tree | 03cf31e8d7db0d0fcdf8384278e672bf437dc423 /libc/misc/regex | |
| parent | 7779fe81082b7521e537b02cdf71f88aff3de358 (diff) | |
ctype: remove some trivial macros from ctype.h;
remove __tolower and __toupper (they existed only in SOME configs!);
remove usages of _tolower (some of them clearly buggy) from uclibc code;
add a few more -U<define> options to unifdef pass over installed headers;
document it on docs/wchar_and_locale.txt
text data bss dec hex filename
- 514963 2727 15396 533086 8225e lib/libuClibc-0.9.30-svn.so
+ 514888 2727 15396 533011 82213 lib/libuClibc-0.9.30-svn.so
Diffstat (limited to 'libc/misc/regex')
| -rw-r--r-- | libc/misc/regex/regcomp.c | 2 | ||||
| -rw-r--r-- | libc/misc/regex/regex.c | 4 | ||||
| -rw-r--r-- | libc/misc/regex/regex_internal.c | 4 | ||||
| -rw-r--r-- | libc/misc/regex/regex_old.c | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/libc/misc/regex/regcomp.c b/libc/misc/regex/regcomp.c index 720214161..0c348a48d 100644 --- a/libc/misc/regex/regcomp.c +++ b/libc/misc/regex/regcomp.c @@ -281,7 +281,7 @@ re_set_fastmap (char *fastmap, int icase, int ch) { fastmap[ch] = 1; if (icase) - fastmap[__tolower (ch)] = 1; + fastmap[tolower (ch)] = 1; } /* Helper function for re_compile_fastmap. diff --git a/libc/misc/regex/regex.c b/libc/misc/regex/regex.c index bc2e502f6..fa46f635f 100644 --- a/libc/misc/regex/regex.c +++ b/libc/misc/regex/regex.c @@ -38,10 +38,6 @@ # define __wctype wctype # endif # include <ctype.h> -# ifdef __UCLIBC_HAS_CTYPE_TABLES__ -# define __toupper toupper -# define __tolower tolower -# endif #endif /* Make sure noone compiles this code with a C++ compiler. */ diff --git a/libc/misc/regex/regex_internal.c b/libc/misc/regex/regex_internal.c index c6685528d..493985217 100644 --- a/libc/misc/regex/regex_internal.c +++ b/libc/misc/regex/regex_internal.c @@ -289,7 +289,7 @@ build_wcs_upper_buffer (re_string_t *pstr) { /* In case of a singlebyte character. */ pstr->mbs[byte_idx] - = __toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]); + = toupper (pstr->raw_mbs[pstr->raw_mbs_idx + byte_idx]); /* The next step uses the assumption that wchar_t is encoded ASCII-safe: all ASCII values can be converted like this. */ pstr->wcs[byte_idx] = (wchar_t) pstr->mbs[byte_idx]; @@ -523,7 +523,7 @@ build_upper_buffer (re_string_t *pstr) if (BE (pstr->trans != NULL, 0)) ch = pstr->trans[ch]; if (islower (ch)) - pstr->mbs[char_idx] = __toupper (ch); + pstr->mbs[char_idx] = toupper (ch); else pstr->mbs[char_idx] = ch; } diff --git a/libc/misc/regex/regex_old.c b/libc/misc/regex/regex_old.c index af1af50a6..bdc298a3e 100644 --- a/libc/misc/regex/regex_old.c +++ b/libc/misc/regex/regex_old.c @@ -226,7 +226,7 @@ char *realloc (); # ifdef _tolower # define TOLOWER(c) _tolower(c) # else -# define TOLOWER(c) __tolower(c) +# define TOLOWER(c) tolower(c) # endif # ifndef NULL |