X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/bc237bbae1393cacee9d534832a050f1148b0d8b..4db310433eb20ec95643299b0d14fefaea44b8bd:/uip/slocal.c

diff --git a/uip/slocal.c b/uip/slocal.c
index 4c670b98..34c615a7 100644
--- a/uip/slocal.c
+++ b/uip/slocal.c
@@ -1,6 +1,4 @@
-
-/*
- * slocal.c -- asynchronously filter and deliver new mail
+/* slocal.c -- asynchronously filter and deliver new mail
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -452,7 +450,7 @@ usr_delivery (int fd, char *delivery, int su)
 	if (*buffer == '#' || *buffer == '\n')
 	    continue;
 
-        TrimSuffixC(buffer, '\n');
+        trim_suffix_c(buffer, '\n');
 
 	/* split buffer into fields */
 	vecp = split (buffer, vec);
@@ -484,7 +482,8 @@ usr_delivery (int fd, char *delivery, int su)
 		 * do this - else fall through
 		 */
  		if (!next)
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 
 	    case '?': 
 		/*
@@ -492,7 +491,8 @@ usr_delivery (int fd, char *delivery, int su)
 		 * consider delivered if action is successful.
 		 */
 		if (won)
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 
 	    case 'A': 
 	    case 'a': 
@@ -538,7 +538,8 @@ usr_delivery (int fd, char *delivery, int su)
 		    if (won)
 			continue;
 		    break;
-		}		/* else fall */
+		}
+		/* FALLTHRU */
 
 	    default: 
 		/* parse message and build lookup table */
@@ -565,7 +566,8 @@ usr_delivery (int fd, char *delivery, int su)
 	    case 'q':
 		/* deliver to quoted pipe */
 		if (strcasecmp (action, "qpipe"))
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 	    case '^':
 		expand (tmpbuf, string, fd);
 		if (split (tmpbuf, vec) < 1)
@@ -576,7 +578,8 @@ usr_delivery (int fd, char *delivery, int su)
 	    case 'p': 
 		/* deliver to pipe */
 		if (strcasecmp (action, "pipe"))
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 	    case '|': 
 		vec[2] = "sh";
 		vec[3] = "-c";
@@ -594,7 +597,8 @@ usr_delivery (int fd, char *delivery, int su)
 		}
 		/* deliver to nmh folder */
 		else if (strcasecmp (action, "folder"))
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 	    case '+':
 		status = usr_folder (fd, string);
 		break;
@@ -607,7 +611,8 @@ usr_delivery (int fd, char *delivery, int su)
 		}
 		/* mbox format */
 		else if (strcasecmp (action, "mbox"))
-		    continue;	/* else fall */
+		    continue;
+		/* FALLTHRU */
 
 	    case '>': 
 		/* mbox format */
@@ -775,11 +780,11 @@ parse (int fd)
 
 	    case LENERR: 
 	    case FMTERR: 
-		advise (NULL, "format error in message");
+		inform("format error in message");
 		break;
 
 	    default: 
-		advise (NULL, "internal error in m_getfld");
+		inform("internal error in m_getfld");
 		fclose (in);
 		return -1;
 	}