Use result, because (void) didn't prevent warning on FreeBSD 10.

[nmh] / uip / mhstoresbr.c

diff --git a/uip/mhstoresbr.c b/uip/mhstoresbr.c
index f1756a86d12fa9873fdd4cea55366641214f3ed2..a2bc919e90cb5e63fb111bd60a5bd6e0c7e22b34 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -42,8 +42,9 @@ struct mhstoreinfo {
 
 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {
 
 mhstoreinfo_t
 mhstoreinfo_create (CT *ct, char *pwd, const char *csw, int asw, int vsw) {

-    mhstoreinfo_t info = mh_xmalloc (sizeof *info);
+    mhstoreinfo_t info;

 
 

+    NEW(info);

     info->cts = ct;
     info->cwd = pwd;
     info->autosw = asw;
     info->cts = ct;
     info->cwd = pwd;
     info->autosw = asw;


@@ -115,7 +116,7 @@ store_all_messages (mhstoreinfo_t info)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)
      * store any contents.
      */
     if ((cp = context_find (nmhstorage)) && *cp)

-       info->dir = getcpy (cp);
+       info->dir = mh_xstrdup(cp);

     else
        info->dir = getcpy (info->cwd);
 
     else
        info->dir = getcpy (info->cwd);
 


@@ -344,9 +345,7 @@ store_partial (CT ct, mhstoreinfo_t info)
        return NOTOK;
     }
 
        return NOTOK;
     }
 

-    if ((base = (CT *) mh_xcalloc ((size_t) (i + 1), sizeof(*base))) == NULL)
-       adios (NULL, "out of memory");
-
+    base = mh_xcalloc(i + 1, sizeof *base);

     ctq = base;
     for (ctp = info->cts; *ctp; ctp++) {
        p = *ctp;
     ctq = base;
     for (ctp = info->cts; *ctp; ctp++) {
        p = *ctp;


@@ -396,7 +395,7 @@ missing_part:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:
     ct = *ctq++;
     if (store_content (ct, NULL, info) == NOTOK) {
 losing:

-       free ((char *) base);
+       free(base);

        return NOTOK;
     }
 
        return NOTOK;
     }
 


@@ -406,7 +405,7 @@ losing:
            goto losing;
     }
 
            goto losing;
     }
 

-    free ((char *) base);
+    free(base);

     return OK;
 }
 
     return OK;
 }
 


@@ -651,7 +650,7 @@ got_filename:
             if (first_partial)
                 fprintf (stderr, "reassembling partials ");
             if (last_partial)
             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 {
             else
                 fprintf (stderr, "%s,", ct->c_file);
         } else {


@@ -675,7 +674,7 @@ got_filename:
                 int cwdlen = strlen (info->cwd);
 
                 fprintf (stderr, " as file %s\n",
                 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);
             }
                          || ct->c_storage[cwdlen] != '/'
                          ? ct->c_storage : ct->c_storage + cwdlen + 1);
             }


@@ -836,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;
 
        if ((pos += strlen (buffer)) > last) {
            int diff;
 


@@ -907,7 +906,7 @@ output_content_folder (char *folder, char *filename)
     /* Read the folder. */
     if ((mp = folder_read (folder, 0))) {
        /* Link file into folder */
     /* 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;
     } else {
        advise (NULL, "unable to read folder %s", folder);
        return NOTOK;


@@ -1055,7 +1054,6 @@ get_storeproc (CT ct)
 {
     char *cp;
     CI ci;
 {
     char *cp;
     CI ci;

-    char storefile[PATH_MAX+1];

 
     /*
      * If the storeproc has already been defined,
 
     /*
      * If the storeproc has already been defined,


@@ -1071,18 +1069,16 @@ get_storeproc (CT ct)
      */
     if (ct->c_dispo) {
        if ((cp = get_param(ct->c_dispo_first, "filename", '_', 0))
      */
     if (ct->c_dispo) {
        if ((cp = get_param(ct->c_dispo_first, "filename", '_', 0))

-               && decode_rfc2047(cp, storefile, PATH_MAX+1)
-               && *storefile != '/'
-               && *storefile != '.'
-               && *storefile != '|'
-               && *storefile != '!'
-               && !strchr (storefile, '%')) {
-               ct->c_storeproc = add (storefile, NULL);
+               && *cp != '/'
+               && *cp != '.'
+               && *cp != '|'
+               && *cp != '!'
+               && !strchr (cp, '%')) {
+               ct->c_storeproc = add (cp, NULL);

                free(cp);
                return;
        }
                free(cp);
                return;
        }

-       if (cp)
-           free(cp);
+        mh_xfree(cp);

     }
 
     /*
     }
 
     /*


@@ -1092,17 +1088,15 @@ get_storeproc (CT ct)
      */
     ci = &ct->c_ctinfo;
     if ((cp = get_param(ci->ci_first_pm, "name", '_', 0))
      */
     ci = &ct->c_ctinfo;
     if ((cp = get_param(ci->ci_first_pm, "name", '_', 0))

-         && decode_rfc2047(cp, storefile, PATH_MAX+1)
-         && *storefile != '/'
-         && *storefile != '.'
-         && *storefile != '|'
-         && *storefile != '!'
-         && !strchr (storefile, '%')) {
-           ct->c_storeproc = add (storefile, NULL);
+         && *cp != '/'
+         && *cp != '.'
+         && *cp != '|'
+         && *cp != '!'
+         && !strchr (cp, '%')) {
+           ct->c_storeproc = add (cp, NULL);

 
     }
 
     }

-    if (cp)
-       free(cp);
+    mh_xfree(cp);

 }
 
 
 }
 
 


@@ -1142,19 +1136,22 @@ static
 enum clobber_policy_t
 clobber_policy (const char *value) {
   if (value == NULL  ||  ! strcasecmp (value, "always")) {
 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;
     return NMH_CLOBBER_AUTO;

-  } else if (! strcasecmp (value, "suffix")) {
+  }
+  if (! strcasecmp (value, "suffix")) {

     return NMH_CLOBBER_SUFFIX;
     return NMH_CLOBBER_SUFFIX;

-  } else if (! strcasecmp (value, "ask")) {
+  }
+  if (! strcasecmp (value, "ask")) {

     return NMH_CLOBBER_ASK;
     return NMH_CLOBBER_ASK;

-  } else if (! strcasecmp (value, "never")) {
+  }
+  if (! strcasecmp (value, "never")) {

     return NMH_CLOBBER_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);

 }
 
 
 }
 
 


@@ -1312,10 +1309,7 @@ clobber_check (char *original_file, mhstoreinfo_t info) {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {
                 file = NULL;
                 ++info->files_not_clobbered;
               } else {

-                char *newline = strchr (buf, '\n');
-                if (newline) {
-                  *newline = '\0';
-                }
+                TrimSuffixC(buf, '\n');

               }
 
               free (file);
               }
 
               free (file);