X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/767e669eb7c50e5dd7e1ec9aae5c06c2b66b0819..39b5e33587d580036cee66bc532c33d45c4bb6fe:/sbr/mf.c diff --git a/sbr/mf.c b/sbr/mf.c index 870a0a52..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 (HasPrefix(string, "From ") - || HasPrefix(string, ">From ")); + return (has_prefix(string, "From ") + || has_prefix(string, ">From ")); } @@ -52,8 +52,8 @@ lequal (const char *a, const char *b) static int isat (const char *p) { - return HasPrefix(p, " AT ") || HasPrefix(p, " At ") || - HasPrefix(p, " aT ") || HasPrefix(p, " at "); + return has_prefix(p, " AT ") || has_prefix(p, " At ") || + has_prefix(p, " aT ") || has_prefix(p, " at "); } @@ -288,6 +288,7 @@ again: ; strcpy (err, "extraneous semi-colon"); return NOTOK; } + /* FALLTHRU */ case LX_COMA: mh_xfree(note); note = NULL; @@ -391,6 +392,7 @@ again: ; strcpy (err, "extraneous semi-colon"); return NOTOK; } + /* FALLTHRU */ case LX_COMA: case LX_END: return OK; @@ -623,6 +625,7 @@ my_lex (char *buffer) continue; case '(': i++; + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -650,6 +653,7 @@ my_lex (char *buffer) cp = NULL; return (last_lex = LX_ERR); } + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -673,6 +677,7 @@ my_lex (char *buffer) cp = NULL; return (last_lex = LX_ERR); } + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -781,7 +786,8 @@ mfgets (FILE *in, char **bp) case '\t': *cp++ = '\n'; break; - } /* fall into default case */ + } + /* FALLTHRU */ default: *cp++ = i;