X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/122129da83e4e9ec2d0363ef9f60d32491af2629..ef1ba39e8dae81091b6c3e73e72825ef6edea3c6:/uip/mhbuildsbr.c?ds=inline

diff --git a/uip/mhbuildsbr.c b/uip/mhbuildsbr.c
index c72bd818..fc90dc01 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 */
@@ -711,9 +710,8 @@ user_content (FILE *in, char *buf, CT *ctp, const char *infilename)
 	    strncpy (content, buf + 2, sizeof(content));
 	    inlineD = 1;
 	    goto rock_and_roll;
-	} else {
-	    inlineD = 0;
 	}
+        inlineD = 0;
 
 	/* the directive is implicit */
 	strncpy (content, "text/plain", sizeof(content));
@@ -1761,8 +1759,7 @@ build_headers (CT ct, int header_encoding)
 	np = output_params(len, ct->c_dispo_first, NULL, 0);
 	vp = add(np, vp);
 	vp = add("\n", vp);
-	if (np)
-	    free(np);
+        mh_xfree(np);
 	add_header (ct, mh_xstrdup(DISPO_FIELD), vp);
     }
 
@@ -2035,8 +2032,7 @@ setup_attach_content(CT ct, char *filename)
 
     for (pm = ct->c_ctinfo.ci_first_pm; pm; pm = pm->pm_next) {
 	if (strcasecmp(pm->pm_name, "name") == 0) {
-	    if (pm->pm_value)
-		free(pm->pm_value);
+            mh_xfree(pm->pm_value);
 	    pm->pm_value = mh_xstrdup(simplename);
 	    break;
 	}
@@ -2274,9 +2270,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