X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c53b61f8d4a809ab53e954594874285ca32d1b11..39b5e33587d580036cee66bc532c33d45c4bb6fe:/sbr/mf.c

diff --git a/sbr/mf.c b/sbr/mf.c
index ebd130d2..a604ce91 100644
--- a/sbr/mf.c
+++ b/sbr/mf.c
@@ -26,8 +26,8 @@ static int my_lex (char *);
 int
 isfrom(const char *string)
 {
-    return (strncmp (string, "From ", 5) == 0
-	    || strncmp (string, ">From ", 6) == 0);
+    return (has_prefix(string, "From ")
+	    || has_prefix(string, ">From "));
 }
 
 
@@ -52,10 +52,8 @@ lequal (const char *a, const char *b)
 static int
 isat (const char *p)
 {
-    return (strncmp (p, " AT ", 4)
-	    && strncmp (p, " At ", 4)
-	    && strncmp (p, " aT ", 4)
-	    && strncmp (p, " at ", 4) ? FALSE : TRUE);
+    return has_prefix(p, " AT ") || has_prefix(p, " At ") ||
+        has_prefix(p, " aT ") || has_prefix(p, " at ");
 }
 
 
@@ -290,6 +288,7 @@ again: ;
 		strcpy (err, "extraneous semi-colon");
 		return NOTOK;
 	    }
+	    /* FALLTHRU */
 	case LX_COMA: 
             mh_xfree(note);
             note = NULL;
@@ -393,6 +392,7 @@ again: ;
 			strcpy (err, "extraneous semi-colon");
 			return NOTOK;
 		    }
+		    /* FALLTHRU */
 		case LX_COMA: 
 		case LX_END: 
 		    return OK;
@@ -625,6 +625,7 @@ my_lex (char *buffer)
 		    continue;
 		case '(': 
 		    i++;
+		    /* FALLTHRU */
 		default: 
 		    ADDCHR(c);
 		    continue;
@@ -652,6 +653,7 @@ my_lex (char *buffer)
 			cp = NULL;
 			return (last_lex = LX_ERR);
 		    }
+		    /* FALLTHRU */
 		default: 
 		    ADDCHR(c);
 		    continue;
@@ -675,6 +677,7 @@ my_lex (char *buffer)
 			cp = NULL;
 			return (last_lex = LX_ERR);
 		    }
+		    /* FALLTHRU */
 		default: 
 		    ADDCHR(c);
 		    continue;
@@ -783,7 +786,8 @@ mfgets (FILE *in, char **bp)
 		    case '\t': 
 			*cp++ = '\n';
 			break;
-		}		/* fall into default case */
+		}
+		/* FALLTHRU */
 
 	    default: 
 		*cp++ = i;