X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/9d9c66b78446aedbccc88d1313a4170e49d917dc..6e1d79d58e5da5ba06bc42ebebd2f6f8f2ceb52e:/uip/mhstoresbr.c?ds=inline

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index f6bc8dcb..a2bc919e 100644
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -395,7 +395,7 @@ missing_part:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:
-	free ((char *) base);
+	free(base);
 	return NOTOK;
     }
 
@@ -405,7 +405,7 @@ losing:
 	    goto losing;
     }
 
-    free ((char *) base);
+    free(base);
     return OK;
 }
 
@@ -650,7 +650,7 @@ got_filename:
             if (first_partial)
                 fprintf (stderr, "reassembling partials ");
             if (last_partial)
-                fprintf (stderr, "%s", ct->c_file);
+                fputs(ct->c_file, stderr);
             else
                 fprintf (stderr, "%s,", ct->c_file);
         } else {
@@ -674,7 +674,7 @@ got_filename:
                 int cwdlen = strlen (info->cwd);
 
                 fprintf (stderr, " as file %s\n",
-                         strncmp (ct->c_storage, info->cwd, cwdlen)
+                         !HasPrefix(ct->c_storage, info->cwd)
                          || ct->c_storage[cwdlen] != '/'
                          ? ct->c_storage : ct->c_storage + cwdlen + 1);
             }
@@ -835,7 +835,7 @@ losing:
 	}
     }
 
-    while (fgets (buffer, sizeof(buffer) - 1, ct->c_fp)) {
+    while (fgets (buffer, sizeof buffer, ct->c_fp)) {
 	if ((pos += strlen (buffer)) > last) {
 	    int diff;
 
@@ -906,7 +906,7 @@ output_content_folder (char *folder, char *filename)
     /* Read the folder. */
     if ((mp = folder_read (folder, 0))) {
 	/* Link file into folder */
-	msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, (char *)0);
+	msgnum = folder_addmsg (&mp, filename, 0, 0, 0, 0, NULL);
     } else {
 	advise (NULL, "unable to read folder %s", folder);
 	return NOTOK;
@@ -1078,8 +1078,7 @@ get_storeproc (CT ct)
 		free(cp);
 		return;
 	}
-	if (cp)
-	    free(cp);
+        mh_xfree(cp);
     }
 
     /*
@@ -1097,8 +1096,7 @@ get_storeproc (CT ct)
 	    ct->c_storeproc = add (cp, NULL);
 
     }
-    if (cp)
-	free(cp);
+    mh_xfree(cp);
 }
 
 
@@ -1138,19 +1136,22 @@ static
 enum clobber_policy_t
 clobber_policy (const char *value) {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {
-  } else if (! strcasecmp (value, "auto")) {
+    return NMH_CLOBBER_ALWAYS;
+  }
+  if (! strcasecmp (value, "auto")) {
     return NMH_CLOBBER_AUTO;
-  } else if (! strcasecmp (value, "suffix")) {
+  }
+  if (! strcasecmp (value, "suffix")) {
     return NMH_CLOBBER_SUFFIX;
-  } else if (! strcasecmp (value, "ask")) {
+  }
+  if (! strcasecmp (value, "ask")) {
     return NMH_CLOBBER_ASK;
-  } else if (! strcasecmp (value, "never")) {
+  }
+  if (! strcasecmp (value, "never")) {
     return NMH_CLOBBER_NEVER;
-  } else {
-    adios (NULL, "invalid argument, %s, to clobber", value);
   }
 
-  return NMH_CLOBBER_ALWAYS;
+  adios (NULL, "invalid argument, %s, to clobber", value);
 }