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

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index 9869914be1c3ccb5feba5fe4223a5b857a0d9be8..57da1df43f91eba518f2cccffaace614a9d52c11 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -116,7 +116,7 @@ store_all_messages (mhstoreinfo_t info)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)
-       info->dir = getcpy (cp);
+       info->dir = mh_xstrdup(cp);
     else
        info->dir = getcpy (info->cwd);
 
@@ -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;
@@ -1308,10 +1308,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {
-                char *newline = strchr (buf, '\n');
-                if (newline) {
-                  *newline = '\0';
-                }
+                TrimSuffixC(buf, '\n');
               }
 
               free (file);