diff options
| author | Christopher Faylor <me@cgf.cx> | 2009-05-04 08:30:37 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2009-05-04 08:30:37 +0400 |
| commit | b7a15524404ee316e205a26c214ca8d3f04f11a3 (patch) | |
| tree | 8f8a27b5ca566d92d4b14ab9f482adca9c762489 /winsup/cygwin/regex | |
| parent | b65ec404a7aa5e036a7d4de415701be7a7efd5fc (diff) | |
* libc/minires.c (scanline): Accommodate ctype changes which disallow use of an
unadorned char argument to is* macros.
* regex/regcomp.c: Ditto, throughout.
* regex/regex2.h (ISWORD): Ditto.
Diffstat (limited to 'winsup/cygwin/regex')
| -rw-r--r-- | winsup/cygwin/regex/regcomp.c | 14 | ||||
| -rw-r--r-- | winsup/cygwin/regex/regex2.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/winsup/cygwin/regex/regcomp.c b/winsup/cygwin/regex/regcomp.c index 580c70328..db83bbcbf 100644 --- a/winsup/cygwin/regex/regcomp.c +++ b/winsup/cygwin/regex/regcomp.c @@ -311,7 +311,7 @@ register struct parse *p; ordinary(p, c); break; case '{': /* okay as ordinary except if digit follows */ - REQUIRE(!MORE() || !isdigit(PEEK()), REG_BADRPT); + REQUIRE(!MORE() || !isdigit((unsigned)PEEK()), REG_BADRPT); /* FALLTHROUGH */ default: ordinary(p, c); @@ -323,7 +323,7 @@ register struct parse *p; c = PEEK(); /* we call { a repetition if followed by a digit */ if (!( c == '*' || c == '+' || c == '?' || - (c == '{' && MORE2() && isdigit(PEEK2())) )) + (c == '{' && MORE2() && isdigit((unsigned)PEEK2())) )) return; /* no repetition, we're done */ NEXT(); @@ -352,7 +352,7 @@ register struct parse *p; case '{': count = p_count(p); if (EAT(',')) { - if (isdigit(PEEK())) { + if (isdigit((unsigned)PEEK())) { count2 = p_count(p); REQUIRE(count <= count2, REG_BADBR); } else /* single number with comma */ @@ -373,7 +373,7 @@ register struct parse *p; return; c = PEEK(); if (!( c == '*' || c == '+' || c == '?' || - (c == '{' && MORE2() && isdigit(PEEK2())) ) ) + (c == '{' && MORE2() && isdigit((unsigned)PEEK2())) ) ) return; SETERROR(REG_BADRPT); } @@ -530,7 +530,7 @@ int starordinary; /* is a leading * an ordinary character? */ } else if (EATTWO('\\', '{')) { count = p_count(p); if (EAT(',')) { - if (MORE() && isdigit(PEEK())) { + if (MORE() && isdigit((unsigned)PEEK())) { count2 = p_count(p); REQUIRE(count <= count2, REG_BADBR); } else /* single number with comma */ @@ -561,7 +561,7 @@ register struct parse *p; register int count = 0; register int ndigits = 0; - while (MORE() && isdigit(PEEK()) && count <= DUPMAX) { + while (MORE() && isdigit((unsigned)PEEK()) && count <= DUPMAX) { count = count*10 + (GETNEXT() - '0'); ndigits++; } @@ -728,7 +728,7 @@ register cset *cs; register const char *u; register char c; - while (MORE() && isalpha(PEEK())) + while (MORE() && isalpha((unsigned)PEEK())) NEXT(); len = p->next - sp; for (cp = cclasses; cp->name != NULL; cp++) diff --git a/winsup/cygwin/regex/regex2.h b/winsup/cygwin/regex/regex2.h index 8c103fa54..be8b2f5a7 100644 --- a/winsup/cygwin/regex/regex2.h +++ b/winsup/cygwin/regex/regex2.h @@ -131,4 +131,4 @@ struct re_guts { /* misc utilities */ #define OUT (CHAR_MAX+1) /* a non-character value */ -#define ISWORD(c) (isalnum(c) || (c) == '_') +#define ISWORD(c) (isalnum((unsigned)c) || (c) == '_') |