From 98a02d3662809b167da6dff3e894dd507c0a9f91 Mon Sep 17 00:00:00 2001 From: skimo Date: Thu, 5 Apr 2001 19:41:27 +0000 Subject: [PATCH] change widechar unfriendly casts --- regex/engine.c | 6 +++--- regex/regcomp.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/regex/engine.c b/regex/engine.c index d5701321..e79ed467 100644 --- a/regex/engine.c +++ b/regex/engine.c @@ -519,7 +519,7 @@ sopno lev; /* PLUS nesting level */ for (ss = startst; !hard && ss < stopst; ss++) switch (OP(s = m->g->strip[ss])) { case OCHAR: - if (sp == stop || *sp++ != (char)OPND(s)) + if (sp == stop || *sp++ != (RCHAR_T)OPND(s)) return(NULL); break; case OANY: @@ -904,8 +904,8 @@ register states aft; /* states already known reachable after */ break; case OCHAR: /* only characters can match */ - assert(!NONCHAR(ch) || ch != (char)OPND(s)); - if (ch == (char)OPND(s)) + assert(!NONCHAR(ch) || ch != (RCHAR_T)OPND(s)); + if (ch == (RCHAR_T)OPND(s)) FWD(aft, bef, 1); break; case OBOL: diff --git a/regex/regcomp.c b/regex/regcomp.c index b909c189..06990e0a 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -1657,7 +1657,7 @@ register struct re_guts *g; while (OP(s = *scan++) != OCHAR) continue; assert(cp < g->must + g->mlen); - *cp++ = (char)OPND(s); + *cp++ = (RCHAR_T)OPND(s); } assert(cp == g->must + g->mlen); *cp++ = '\0'; /* just on general principles */ -- 2.11.4.GIT