Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more warning fixes

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11000 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-13 14:13:20 +00:00
parent 1f0db2d994
commit f8fea431d2
4 changed files with 126 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/regex/cclass.h
View File

@@ -4,28 +4,28 @@ static struct cclass {
char *chars; char *chars;
char *multis; char *multis;
} cclasses[] = { } cclasses[] = {
"alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ { "alnum", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
0123456789", "", 0123456789", "" },
"alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", { "alpha", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" },
"", { "" },
"blank", " \t", "", { "blank", " \t", "" },
"cntrl", "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\ { "cntrl", "\007\b\t\n\v\f\r\1\2\3\4\5\6\16\17\20\21\22\23\24\
\25\26\27\30\31\32\33\34\35\36\37\177", "", \25\26\27\30\31\32\33\34\35\36\37\177", "" },
"digit", "0123456789", "", { "digit", "0123456789", "" },
"graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ { "graph", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", 0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" },
"", { "" },
"lower", "abcdefghijklmnopqrstuvwxyz", { "lower", "abcdefghijklmnopqrstuvwxyz" },
"", { "" },
"print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\ { "print", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ", 0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ " },
"", { "" },
"punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", { "punct", "!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~" },
"", { "" },
"space", "\t\n\v\f\r ", "", { "space", "\t\n\v\f\r ", "" },
"upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", { "upper", "ABCDEFGHIJKLMNOPQRSTUVWXYZ" },
"", { "" },
"xdigit", "0123456789ABCDEFabcdef", { "xdigit", "0123456789ABCDEFabcdef" },
"", { "" },
NULL, 0, "" { NULL, 0, "" }
}; };

192
src/regex/cname.h
View File

@@ -3,100 +3,100 @@ static struct cname {
char *name; char *name;
char code; char code;
} cnames[] = { } cnames[] = {
"NUL", '\0', { "NUL", '\0' },
"SOH", '\001', { "SOH", '\001' },
"STX", '\002', { "STX", '\002' },
"ETX", '\003', { "ETX", '\003' },
"EOT", '\004', { "EOT", '\004' },
"ENQ", '\005', { "ENQ", '\005' },
"ACK", '\006', { "ACK", '\006' },
"BEL", '\007', { "BEL", '\007' },
"alert", '\007', { "alert", '\007' },
"BS", '\010', { "BS", '\010' },
"backspace", '\b', { "backspace", '\b' },
"HT", '\011', { "HT", '\011' },
"tab", '\t', { "tab", '\t' },
"LF", '\012', { "LF", '\012' },
"newline", '\n', { "newline", '\n' },
"VT", '\013', { "VT", '\013' },
"vertical-tab", '\v', { "vertical-tab", '\v' },
"FF", '\014', { "FF", '\014' },
"form-feed", '\f', { "form-feed", '\f' },
"CR", '\015', { "CR", '\015' },
"carriage-return", '\r', { "carriage-return", '\r' },
"SO", '\016', { "SO", '\016' },
"SI", '\017', { "SI", '\017' },
"DLE", '\020', { "DLE", '\020' },
"DC1", '\021', { "DC1", '\021' },
"DC2", '\022', { "DC2", '\022' },
"DC3", '\023', { "DC3", '\023' },
"DC4", '\024', { "DC4", '\024' },
"NAK", '\025', { "NAK", '\025' },
"SYN", '\026', { "SYN", '\026' },
"ETB", '\027', { "ETB", '\027' },
"CAN", '\030', { "CAN", '\030' },
"EM", '\031', { "EM", '\031' },
"SUB", '\032', { "SUB", '\032' },
"ESC", '\033', { "ESC", '\033' },
"IS4", '\034', { "IS4", '\034' },
"FS", '\034', { "FS", '\034' },
"IS3", '\035', { "IS3", '\035' },
"GS", '\035', { "GS", '\035' },
"IS2", '\036', { "IS2", '\036' },
"RS", '\036', { "RS", '\036' },
"IS1", '\037', { "IS1", '\037' },
"US", '\037', { "US", '\037' },
"space", ' ', { "space", ' ' },
"exclamation-mark", '!', { "exclamation-mark", '!' },
"quotation-mark", '"', { "quotation-mark", '"' },
"number-sign", '#', { "number-sign", '#' },
"dollar-sign", '$', { "dollar-sign", '$' },
"percent-sign", '%', { "percent-sign", '%' },
"ampersand", '&', { "ampersand", '&' },
"apostrophe", '\'', { "apostrophe", '\'' },
"left-parenthesis", '(', { "left-parenthesis", '(' },
"right-parenthesis", ')', { "right-parenthesis", ')' },
"asterisk", '*', { "asterisk", '*' },
"plus-sign", '+', { "plus-sign", '+' },
"comma", ',', { "comma", ',' },
"hyphen", '-', { "hyphen", '-' },
"hyphen-minus", '-', { "hyphen-minus", '-' },
"period", '.', { "period", '.' },
"full-stop", '.', { "full-stop", '.' },
"slash", '/', { "slash", '/' },
"solidus", '/', { "solidus", '/' },
"zero", '0', { "zero", '0' },
"one", '1', { "one", '1' },
"two", '2', { "two", '2' },
"three", '3', { "three", '3' },
"four", '4', { "four", '4' },
"five", '5', { "five", '5' },
"six", '6', { "six", '6' },
"seven", '7', { "seven", '7' },
"eight", '8', { "eight", '8' },
"nine", '9', { "nine", '9' },
"colon", ':', { "colon", ':' },
"semicolon", ';', { "semicolon", ';' },
"less-than-sign", '<', { "less-than-sign", '<' },
"equals-sign", '=', { "equals-sign", '=' },
"greater-than-sign", '>', { "greater-than-sign", '>' },
"question-mark", '?', { "question-mark", '?' },
"commercial-at", '@', { "commercial-at", '@' },
"left-square-bracket", '[', { "left-square-bracket", '[' },
"backslash", '\\', { "backslash", '\\' },
"reverse-solidus", '\\', { "reverse-solidus", '\\' },
"right-square-bracket", ']', { "right-square-bracket", ']' },
"circumflex", '^', { "circumflex", '^' },
"circumflex-accent", '^', { "circumflex-accent", '^' },
"underscore", '_', { "underscore", '_' },
"low-line", '_', { "low-line", '_' },
"grave-accent", '`', { "grave-accent", '`' },
"left-brace", '{', { "left-brace", '{' },
"left-curly-bracket", '{', { "left-curly-bracket", '{' },
"vertical-line", '|', { "vertical-line", '|' },
"right-brace", '}', { "right-brace", '}' },
"right-curly-bracket", '}', { "right-curly-bracket", '}' },
"tilde", '~', { "tilde", '~' },
"DEL", '\177', { "DEL", '\177' },
NULL, 0, { NULL, 0 },
}; };

5
src/regex/regcomp.c
View File

@@ -51,7 +51,7 @@ static char nuls[10]; /* place to point scanner in event of error */
#define NEXTn(n) (p->next += (n)) #define NEXTn(n) (p->next += (n))
#define GETNEXT() (*p->next++) #define GETNEXT() (*p->next++)
#define SETERROR(e) seterr(p, (e)) #define SETERROR(e) seterr(p, (e))
#define REQUIRE(co, e) ((co) || SETERROR(e)) #define REQUIRE(co, e) ((void)((co) || SETERROR(e)))
#define MUSTSEE(c, e) (REQUIRE(MORE() && PEEK() == (c), e)) #define MUSTSEE(c, e) (REQUIRE(MORE() && PEEK() == (c), e))
#define MUSTEAT(c, e) (REQUIRE(MORE() && GETNEXT() == (c), e)) #define MUSTEAT(c, e) (REQUIRE(MORE() && GETNEXT() == (c), e))
#define MUSTNOTSEE(c, e) (REQUIRE(!MORE() || PEEK() != (c), e)) #define MUSTNOTSEE(c, e) (REQUIRE(!MORE() || PEEK() != (c), e))
@@ -1169,6 +1169,8 @@ register char *cp;
cs->multis[cs->smultis - 1] = '\0'; cs->multis[cs->smultis - 1] = '\0';
} }
/* these functions don't seem to be used (yet?), suppress warnings */
#if 0
/* /*
- mcsub - subtract a collating element from a cset - mcsub - subtract a collating element from a cset
== static void mcsub(register cset *cs, register char *cp); == static void mcsub(register cset *cs, register char *cp);
@@ -1226,6 +1228,7 @@ register char *cp;
return(p); return(p);
return(NULL); return(NULL);
} }
#endif /* 0 */
/* /*
- mcinvert - invert the list of collating elements in a cset - mcinvert - invert the list of collating elements in a cset

2
src/regex/regcomp.ih
View File

@@ -28,9 +28,11 @@ static int freezeset(register struct parse *p, register cset *cs);
static int firstch(register struct parse *p, register cset *cs); static int firstch(register struct parse *p, register cset *cs);
static int nch(register struct parse *p, register cset *cs); static int nch(register struct parse *p, register cset *cs);
static void mcadd(register struct parse *p, register cset *cs, register char *cp); static void mcadd(register struct parse *p, register cset *cs, register char *cp);
#if 0
static void mcsub(register cset *cs, register char *cp); static void mcsub(register cset *cs, register char *cp);
static int mcin(register cset *cs, register char *cp); static int mcin(register cset *cs, register char *cp);
static char *mcfind(register cset *cs, register char *cp); static char *mcfind(register cset *cs, register char *cp);
#endif
static void mcinvert(register struct parse *p, register cset *cs); static void mcinvert(register struct parse *p, register cset *cs);
static void mccase(register struct parse *p, register cset *cs); static void mccase(register struct parse *p, register cset *cs);
static int isinsets(register struct re_guts *g, int c); static int isinsets(register struct re_guts *g, int c);