fix many clang warnings in lib/

2011-06-23 19:25:36 +02:00
parent 6d8d7a88b2
commit e3f68488ee
24 changed files with 250 additions and 496 deletions
@@ -43,28 +43,17 @@ static struct cclass {
 	char *chars;
 	char *multis;
 } cclasses[] = {
-	"alnum",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789",				"",
-	"alpha",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
-					"",
-	"blank",	" \t",		"",
-	"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",	"",
-	"digit",	"0123456789",	"",
-	"graph",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-					"",
-	"lower",	"abcdefghijklmnopqrstuvwxyz",
-					"",
-	"print",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\
-0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ",
-					"",
-	"punct",	"!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~",
-					"",
-	"space",	"\t\n\v\f\r ",	"",
-	"upper",	"ABCDEFGHIJKLMNOPQRSTUVWXYZ",
-					"",
-	"xdigit",	"0123456789ABCDEFabcdef",
-					"",
-	NULL,		0,		""
+	{	"alnum",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", "" },
+	{	"alpha",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", "" },
+	{	"blank",	" \t",		"" },
+	{	"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", "" },
+	{	"digit",	"0123456789",	"" },
+	{	"graph",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", "" },
+	{	"lower",	"abcdefghijklmnopqrstuvwxyz", "" },
+	{	"print",	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ ", "" },
+	{	"punct",	"!\"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~", "" },
+	{	"space",	"\t\n\v\f\r ",	"" },
+	{	"upper",	"ABCDEFGHIJKLMNOPQRSTUVWXYZ", "" },
+	{	"xdigit",	"0123456789ABCDEFabcdef", "" },
+	{	NULL,		0,		"" }
 };
@@ -42,100 +42,100 @@ static struct cname {
 	char *name;
 	char code;
 } cnames[] = {
-	"NUL",	'\0',
-	"SOH",	'\001',
-	"STX",	'\002',
-	"ETX",	'\003',
-	"EOT",	'\004',
-	"ENQ",	'\005',
-	"ACK",	'\006',
-	"BEL",	'\007',
-	"alert",	'\007',
-	"BS",		'\010',
-	"backspace",	'\b',
-	"HT",		'\011',
-	"tab",		'\t',
-	"LF",		'\012',
-	"newline",	'\n',
-	"VT",		'\013',
-	"vertical-tab",	'\v',
-	"FF",		'\014',
-	"form-feed",	'\f',
-	"CR",		'\015',
-	"carriage-return",	'\r',
-	"SO",	'\016',
-	"SI",	'\017',
-	"DLE",	'\020',
-	"DC1",	'\021',
-	"DC2",	'\022',
-	"DC3",	'\023',
-	"DC4",	'\024',
-	"NAK",	'\025',
-	"SYN",	'\026',
-	"ETB",	'\027',
-	"CAN",	'\030',
-	"EM",	'\031',
-	"SUB",	'\032',
-	"ESC",	'\033',
-	"IS4",	'\034',
-	"FS",	'\034',
-	"IS3",	'\035',
-	"GS",	'\035',
-	"IS2",	'\036',
-	"RS",	'\036',
-	"IS1",	'\037',
-	"US",	'\037',
-	"space",		' ',
-	"exclamation-mark",	'!',
-	"quotation-mark",	'"',
-	"number-sign",		'#',
-	"dollar-sign",		'$',
-	"percent-sign",		'%',
-	"ampersand",		'&',
-	"apostrophe",		'\'',
-	"left-parenthesis",	'(',
-	"right-parenthesis",	')',
-	"asterisk",	'*',
-	"plus-sign",	'+',
-	"comma",	',',
-	"hyphen",	'-',
-	"hyphen-minus",	'-',
-	"period",	'.',
-	"full-stop",	'.',
-	"slash",	'/',
-	"solidus",	'/',
-	"zero",		'0',
-	"one",		'1',
-	"two",		'2',
-	"three",	'3',
-	"four",		'4',
-	"five",		'5',
-	"six",		'6',
-	"seven",	'7',
-	"eight",	'8',
-	"nine",		'9',
-	"colon",	':',
-	"semicolon",	';',
-	"less-than-sign",	'<',
-	"equals-sign",		'=',
-	"greater-than-sign",	'>',
-	"question-mark",	'?',
-	"commercial-at",	'@',
-	"left-square-bracket",	'[',
-	"backslash",		'\\',
-	"reverse-solidus",	'\\',
-	"right-square-bracket",	']',
-	"circumflex",		'^',
-	"circumflex-accent",	'^',
-	"underscore",		'_',
-	"low-line",		'_',
-	"grave-accent",		'`',
-	"left-brace",		'{',
-	"left-curly-bracket",	'{',
-	"vertical-line",	'|',
-	"right-brace",		'}',
-	"right-curly-bracket",	'}',
-	"tilde",		'~',
-	"DEL",	'\177',
-	NULL,	0,
+	{	"NUL",	'\0' },
+	{	"SOH",	'\001' },
+	{	"STX",	'\002' },
+	{	"ETX",	'\003' },
+	{	"EOT",	'\004' },
+	{	"ENQ",	'\005' },
+	{	"ACK",	'\006' },
+	{	"BEL",	'\007' },
+	{	"alert",	'\007' },
+	{	"BS",		'\010' },
+	{	"backspace",	'\b' },
+	{	"HT",		'\011' },
+	{	"tab",		'\t' },
+	{	"LF",		'\012' },
+	{	"newline",	'\n' },
+	{	"VT",		'\013' },
+	{	"vertical-tab",	'\v' },
+	{	"FF",		'\014' },
+	{	"form-feed",	'\f' },
+	{	"CR",		'\015' },
+	{	"carriage-return",	'\r' },
+	{	"SO",	'\016' },
+	{	"SI",	'\017' },
+	{	"DLE",	'\020' },
+	{	"DC1",	'\021' },
+	{	"DC2",	'\022' },
+	{	"DC3",	'\023' },
+	{	"DC4",	'\024' },
+	{	"NAK",	'\025' },
+	{	"SYN",	'\026' },
+	{	"ETB",	'\027' },
+	{	"CAN",	'\030' },
+	{	"EM",	'\031' },
+	{	"SUB",	'\032' },
+	{	"ESC",	'\033' },
+	{	"IS4",	'\034' },
+	{	"FS",	'\034' },
+	{	"IS3",	'\035' },
+	{	"GS",	'\035' },
+	{	"IS2",	'\036' },
+	{	"RS",	'\036' },
+	{	"IS1",	'\037' },
+	{	"US",	'\037' },
+	{	"space",		' ' },
+	{	"exclamation-mark",	'!' },
+	{	"quotation-mark",	'"' },
+	{	"number-sign",		'#' },
+	{	"dollar-sign",		'$' },
+	{	"percent-sign",		'%' },
+	{	"ampersand",		'&' },
+	{	"apostrophe",		'\'' },
+	{	"left-parenthesis",	'(' },
+	{	"right-parenthesis",	')' },
+	{	"asterisk",	'*' },
+	{	"plus-sign",	'+' },
+	{	"comma",	',' },
+	{	"hyphen",	'-' },
+	{	"hyphen-minus",	'-' },
+	{	"period",	'.' },
+	{	"full-stop",	'.' },
+	{	"slash",	'/' },
+	{	"solidus",	'/' },
+	{	"zero",		'0' },
+	{	"one",		'1' },
+	{	"two",		'2' },
+	{	"three",	'3' },
+	{	"four",		'4' },
+	{	"five",		'5' },
+	{	"six",		'6' },
+	{	"seven",	'7' },
+	{	"eight",	'8' },
+	{	"nine",		'9' },
+	{	"colon",	':' },
+	{	"semicolon",	';' },
+	{	"less-than-sign",	'<' },
+	{	"equals-sign",		'=' },
+	{	"greater-than-sign",	'>' },
+	{	"question-mark",	'?' },
+	{	"commercial-at",	'@' },
+	{	"left-square-bracket",	'[' },
+	{	"backslash",		'\\' },
+	{	"reverse-solidus",	'\\' },
+	{	"right-square-bracket",	']' },
+	{	"circumflex",		'^' },
+	{	"circumflex-accent",	'^' },
+	{	"underscore",		'_' },
+	{	"low-line",		'_' },
+	{	"grave-accent",		'`' },
+	{	"left-brace",		'{' },
+	{	"left-curly-bracket",	'{' },
+	{	"vertical-line",	'|' },
+	{	"right-brace",		'}' },
+	{	"right-curly-bracket",	'}' },
+	{	"tilde",		'~' },
+	{	"DEL",	'\177' },
+	{	NULL,	0 }
 };
@@ -107,9 +107,6 @@ static int freezeset(struct parse *p, cset *cs);
 static int firstch(struct parse *p, cset *cs);
 static int nch(struct parse *p, cset *cs);
 static void mcadd(struct parse *p, cset *cs, char *cp);
-static void mcsub(cset *cs, char *cp);
-static int mcin(cset *cs, char *cp);
-static char *mcfind(cset *cs, char *cp);
 static void mcinvert(struct parse *p, cset *cs);
 static void mccase(struct parse *p, cset *cs);
 static int isinsets(struct re_guts *g, int c);
@@ -677,7 +674,6 @@ static void
 p_bracket(p)
 register struct parse *p;
 {
-	register char c;
 	register cset *cs = allocset(p);
 	register int invert = 0;

@@ -825,7 +821,7 @@ register cset *cs;
 	register char *u;
 	register char c;

-	while (MORE() && isalpha(PEEK()))
+	while (MORE() && isalpha((unsigned char) (PEEK())))
 		NEXT();
 	len = p->next - sp;
 	for (cp = cclasses; cp->name != NULL; cp++)
@@ -893,7 +889,6 @@ int endc;			/* name ended by endc,']' */
 	register char *sp = p->next;
 	register struct cname *cp;
 	register int len;
-	register char c;

 	while (MORE() && !SEETWO(endc, ']'))
 		NEXT();
@@ -1268,64 +1263,6 @@ register char *cp;
 	cs->multis[cs->smultis - 1] = '\0';
 }

-/*
- - mcsub - subtract a collating element from a cset
- == static void mcsub(register cset *cs, register char *cp);
- */
-static void
-mcsub(cs, cp)
-register cset *cs;
-register char *cp;
-{
-	register char *fp = mcfind(cs, cp);
-	register size_t len = strlen(fp);
-
-	assert(fp != NULL);
-	(void) memmove(fp, fp + len + 1,
-				cs->smultis - (fp + len + 1 - cs->multis));
-	cs->smultis -= len;
-
-	if (cs->smultis == 0) {
-		free(cs->multis);
-		cs->multis = NULL;
-		return;
-	}
-
-	cs->multis = realloc(cs->multis, cs->smultis);
-	assert(cs->multis != NULL);
-}
-
-/*
- - mcin - is a collating element in a cset?
- == static int mcin(register cset *cs, register char *cp);
- */
-static int
-mcin(cs, cp)
-register cset *cs;
-register char *cp;
-{
-	return(mcfind(cs, cp) != NULL);
-}
-
-/*
- - mcfind - find a collating element in a cset
- == static char *mcfind(register cset *cs, register char *cp);
- */
-static char *
-mcfind(cs, cp)
-register cset *cs;
-register char *cp;
-{
-	register char *p;
-
-	if (cs->multis == NULL)
-		return(NULL);
-	for (p = cs->multis; *p != '\0'; p += strlen(p) + 1)
-		if (strcmp(cp, p) == 0)
-			return(p);
-	return(NULL);
-}
-
 /*
 - mcinvert - invert the list of collating elements in a cset
 == static void mcinvert(register struct parse *p, register cset *cs);
@@ -91,23 +91,23 @@ static struct rerr {
 	char *name;
 	char *explain;
 } rerrs[] = {
-	REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match",
-	REG_BADPAT,	"REG_BADPAT",	"invalid regular expression",
-	REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element",
-	REG_ECTYPE,	"REG_ECTYPE",	"invalid character class",
-	REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)",
-	REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number",
-	REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced",
-	REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced",
-	REG_EBRACE,	"REG_EBRACE",	"braces not balanced",
-	REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)",
-	REG_ERANGE,	"REG_ERANGE",	"invalid character range",
-	REG_ESPACE,	"REG_ESPACE",	"out of memory",
-	REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid",
-	REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression",
-	REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug",
-	REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine",
-	0,		"",		"*** unknown regexp error code ***",
+	{	REG_NOMATCH,	"REG_NOMATCH",	"regexec() failed to match" },
+	{	REG_BADPAT,	"REG_BADPAT",	"invalid regular expression" },
+	{	REG_ECOLLATE,	"REG_ECOLLATE",	"invalid collating element" },
+	{	REG_ECTYPE,	"REG_ECTYPE",	"invalid character class" },
+	{	REG_EESCAPE,	"REG_EESCAPE",	"trailing backslash (\\)" },
+	{	REG_ESUBREG,	"REG_ESUBREG",	"invalid backreference number" },
+	{	REG_EBRACK,	"REG_EBRACK",	"brackets ([ ]) not balanced" },
+	{	REG_EPAREN,	"REG_EPAREN",	"parentheses not balanced" },
+	{	REG_EBRACE,	"REG_EBRACE",	"braces not balanced" },
+	{	REG_BADBR,	"REG_BADBR",	"invalid repetition count(s)" },
+	{	REG_ERANGE,	"REG_ERANGE",	"invalid character range" },
+	{	REG_ESPACE,	"REG_ESPACE",	"out of memory" },
+	{	REG_BADRPT,	"REG_BADRPT",	"repetition-operator operand invalid" },
+	{	REG_EMPTY,	"REG_EMPTY",	"empty (sub)expression" },
+	{	REG_ASSERT,	"REG_ASSERT",	"\"can't happen\" -- you found a bug" },
+	{	REG_INVARG,	"REG_INVARG",	"invalid argument to regex routine" },
+	{	0,		"",		"*** unknown regexp error code ***" }
 };

 /*
@@ -169,8 +169,6 @@ const regex_t *preg;
 char *localbuf;
 {
 	register struct rerr *r;
-	register size_t siz;
-	register char *p;

 	for (r = rerrs; r->code != 0; r++)
 		if (strcmp(r->name, preg->re_endp) == 0)