From: Ralph Corderoy <ralph@inputplus.co.uk>
Date: Thu, 20 Oct 2016 22:23:46 +0000 (+0100)
Subject: Don't `else' after return.  Simplify control flow.
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/3cdc1087054ab41df63c54f0f9da6a646fca0847?hp=b51fb9b3f17fd5138e17288f1165c8b69fc95036

Don't `else' after return.  Simplify control flow.
---

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index c72bd818..9a0299eb 100644
--- a/uip/mhbuildsbr.c
+++ b/uip/mhbuildsbr.c
@@ -190,9 +190,8 @@ build_mime (char *infile, int autobuild, int dist, int directives,
 		    fclose(in);
 		    free (ct);
 		    return NULL;
-		} else {
-		    adios (NULL, "draft shouldn't contain %s: field", name);
 		}
+                adios (NULL, "draft shouldn't contain %s: field", name);
 	    }
 
 	    /* ignore any Content-Type fields in the header */
@@ -2274,9 +2273,8 @@ expand_pseudoheader (CT ct, CT *text_plain_ct, struct multipart *m,
             free (reply_file);
             admonish (NULL, "failed to read %s", reply_file);
             return;
-        } else {
-            (void) close (fd);
-        }
+        } 
+        (void) close (fd);
     }
 
     /* This sets reply_ct->c_ctparams, and reply_ct->c_termproc if the