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 57da1df43f91eba518f2cccffaace614a9d52c11..a2bc919e90cb5e63fb111bd60a5bd6e0c7e22b34 100644 (file)
--- a/uip/mhstoresbr.c
+++ b/uip/mhstoresbr.c
@@ -395,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;
     }
 


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

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

     return OK;
 }
 
     return OK;
 }
 


@@ -650,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 {


@@ -674,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);
             }


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


@@ -1078,8 +1078,7 @@ get_storeproc (CT ct)
                free(cp);
                return;
        }
                free(cp);
                return;
        }

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

     }
 
     /*
     }
 
     /*


@@ -1097,8 +1096,7 @@ get_storeproc (CT ct)
            ct->c_storeproc = add (cp, NULL);
 
     }
            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")) {
 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);

 }
 
 
 }