diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-01-19 02:23:18 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-01-19 02:23:18 +0000 |
| commit | ea6eb383294fbf1def7d05e4785a78e68cbf31ce (patch) | |
| tree | 8475572d9574bc074ebc2d46b1aa48def4312487 /posix/fnmatch_loop.c | |
| parent | b51094bd752d9c1c01ec46b54ab10c0c0e5d729d (diff) | |
Update.
2000-01-18 Bruno Haible <haible@ilog.fr>
* posix/fnmatch.c (ISWCTYPE): New macro.
(__wcschrnul): New function.
(BTOWC): New macro. Define it instead of __btowc.
(is_char_class) [!_LIBC]: Fix 'mstate_t' typo. Fix 2nd arg to
wcsrtombs. Call wctype, not __wctype.
* posix/fnmatch_loop.c (FCT): Use ISWCTYPE instead of __iswctype, and
BTOWC instead of __btowc.
2000-01-18 Andreas Jaeger <aj@suse.de>
* inet/Versions: Add new functions added on 2000-01-17.
Diffstat (limited to 'posix/fnmatch_loop.c')
| -rw-r--r-- | posix/fnmatch_loop.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c index 037a26d623..a7fcac7c80 100644 --- a/posix/fnmatch_loop.c +++ b/posix/fnmatch_loop.c @@ -224,7 +224,7 @@ FCT (pattern, string, no_leading_period, flags) /* Invalid character class name. */ return FNM_NOMATCH; - if (__iswctype (__btowc ((UCHAR) *n), wt)) + if (ISWCTYPE (BTOWC ((UCHAR) *n), wt)) goto matched; # else if ((STREQ (str, L("alnum")) && ISALNUM ((UCHAR) *n)) @@ -325,6 +325,7 @@ FCT (pattern, string, no_leading_period, flags) return 0; return FNM_NOMATCH; +} #undef FOLD #undef CHAR @@ -333,4 +334,4 @@ FCT (pattern, string, no_leading_period, flags) #undef STRCHR #undef STRCHRNUL #undef L -} +#undef BTOWC |