--- src/usr.bin/make/str.c	2004/11/13 07:25:17	1.8
+++ src/usr.bin/make/str.c	2004/12/10 00:38:21	1.9
@@ -222,8 +222,12 @@ brk_string(char *str, int *store_argc, B
 			case 't':
 				ch = '\t';
 				break;
+			default:
+				break;
 			}
 			break;
+		default:
+			break;
 		}
 		if (!start)
 			start = t;
@@ -414,7 +418,7 @@ Str_SYSVMatch(const char *word, const ch
 void
 Str_SYSVSubst(Buffer buf, const char *pat, const char *src, int len)
 {
-    char *m;
+    const char *m;
 
     if ((m = strchr(pat, '%')) != NULL) {
 	/* Copy the prefix */