X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e8fe77294085e66b09cbb8043458f22b5b2ef1e6..9322ba2854211794c27fae9468768b80b767c211:/uip/sendsbr.c

diff --git a/uip/sendsbr.c b/uip/sendsbr.c
index 66ce65d1..6409aeca 100644
--- a/uip/sendsbr.c
+++ b/uip/sendsbr.c
@@ -286,7 +286,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 
     nparts = 1;
     pos = start;
-    while (fgets (buffer, sizeof(buffer) - 1, in)) {
+    while (fgets (buffer, sizeof buffer, in)) {
 	long len;
 
 	if ((pos += (len = strlen (buffer))) > CPERMSG) {
@@ -298,8 +298,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     /* Only one part, nothing to split */
     if (nparts == 1) {
 	free (cp);
-	if (dp)
-	    free (dp);
+        mh_xfree(dp);
 
 	fclose (in);
 	return sendaux (vec, vecp, program, drft, st);
@@ -357,7 +356,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
 	for (;;) {
 	    long len;
 
-	    if (!fgets (buffer, sizeof(buffer) - 1, in)) {
+	    if (!fgets (buffer, sizeof buffer, in)) {
 		if (partno == nparts)
 		    break;
 		adios (NULL, "premature eof");
@@ -405,8 +404,7 @@ splitmsg (char **vec, int vecp, char *program, char *drft,
     }
 
     free (cp);
-    if (dp)
-	free (dp);
+    mh_xfree(dp);
 
     fclose (in);	/* close the draft */
     return status;
@@ -524,6 +522,7 @@ alert (char *file, int out)
 	case NOTOK:
 	    /* oops -- fork error */
 	    advise ("fork", "unable to");
+	    /* FALLTHRU */
 
 	case OK:
 	    /* child process -- send it */
@@ -623,6 +622,7 @@ anno (int fd, struct stat *st)
 			    "unable to fork, so doing annotations by hand...");
 	    if (cwd == NULL)
 		cwd = mh_xstrdup(pwd ());
+	    /* FALLTHRU */
 
 	case OK:
 	    /* block a few signals */
@@ -893,10 +893,10 @@ get_from_header_info(const char *filename, const char **addr, const char **host,
         fclose(in);
 
         return OK;
-    } else {
-        *message = "unable to open";
-        return NOTOK;
     }
+
+    *message = "unable to open";
+    return NOTOK;
 }