3 files changed, 7 insertions, 6 deletions

diff --git a/lib/libc/regex/engine.c b/lib/libc/regex/engine.c
index 8b54837c7316..6d982f889c51 100644
--- a/lib/libc/regex/engine.c
+++ b/lib/libc/regex/engine.c
@@ -686,7 +686,6 @@ sopno lev;			/* PLUS nesting level */
 	/* "can't happen" */
 	assert(nope);
 	/* NOTREACHED */
-	return "shut up gcc";
 }
 
 /*
diff --git a/lib/libc/regex/regcomp.c b/lib/libc/regex/regcomp.c
index 10412aada61d..feb24ecced33 100644
--- a/lib/libc/regex/regcomp.c
+++ b/lib/libc/regex/regcomp.c
@@ -673,6 +673,7 @@ static void
 p_bracket(p)
 register struct parse *p;
 {
+	register char c;
 	register cset *cs = allocset(p);
 	register int invert = 0;
 
@@ -820,7 +821,7 @@ register cset *cs;
 	register char *u;
 	register char c;
 
-	while (MORE() && isalpha((unsigned char)PEEK()))
+	while (MORE() && isalpha(PEEK()))
 		NEXT();
 	len = p->next - sp;
 	for (cp = cclasses; cp->name != NULL; cp++)
@@ -888,6 +889,7 @@ 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();
@@ -913,7 +915,6 @@ static char			/* if no counterpart, return ch */
 othercase(ch)
 int ch;
 {
-	ch = (unsigned char)ch;
 	assert(isalpha(ch));
 	if (isupper(ch))
 		return(tolower(ch));
@@ -938,7 +939,6 @@ int ch;
 	register char *oldend = p->end;
 	char bracket[3];
 
-	ch = (unsigned char)ch;
 	assert(othercase(ch) != ch);	/* p_bracket() would recurse */
 	p->next = bracket;
 	p->end = bracket+2;
@@ -962,7 +962,7 @@ register int ch;
 {
 	register cat_t *cap = p->g->categories;
 
-	if ((p->g->cflags&REG_ICASE) && isalpha((unsigned char)ch) && othercase(ch) != ch)
+	if ((p->g->cflags&REG_ICASE) && isalpha(ch) && othercase(ch) != ch)
 		bothcases(p, ch);
 	else {
 		EMIT(OCHAR, (unsigned char)ch);
@@ -1213,7 +1213,7 @@ register cset *cs;
 
 	for (i = 0; i < css; i++)
 		if (CHIN(cs, i))
-			return((unsigned char)i);
+			return((char)i);
 	assert(never);
 	return(0);		/* arbitrary */
 }
diff --git a/lib/libc/regex/regerror.c b/lib/libc/regex/regerror.c
index 212f709cf73f..2d2160ac1126 100644
--- a/lib/libc/regex/regerror.c
+++ b/lib/libc/regex/regerror.c
@@ -166,6 +166,8 @@ 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)