new.c: Order two return statements to match comment.

[nmh] / sbr / arglist.c

diff --git a/sbr/arglist.c b/sbr/arglist.c
index 35646afa8eee687d8c7401cab9f7e056abeeff8a..59d311b210d1b1a8ade66885bfccb2554fb26ffe 100644 (file)
--- a/sbr/arglist.c
+++ b/sbr/arglist.c
@@ -1,5 +1,4 @@
-/*
- * arglist.c -- Routines for handling argument lists for execvp() and friends
+/* arglist.c -- Routines for handling argument lists for execvp() and friends

  *
  * This code is Copyright (c) 2013, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  *
  * This code is Copyright (c) 2013, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -51,7 +50,7 @@ argsplit(char *command, char **file, int *argp)
        }
     }
 
        }
     }
 

-    argvarray = (char **) mh_xmalloc((sizeof(char **) * (MAXARGS + 5)));
+    argvarray = (char **)mh_xmalloc(sizeof *argvarray * (MAXARGS + 5));

 
     /*
      * The simple case - no spaces or shell metacharacters
 
     /*
      * The simple case - no spaces or shell metacharacters


@@ -132,7 +131,7 @@ arglist_free(char *command, char **argvarray)
 {
     int i;
 
 {
     int i;
 

-    mh_xfree(command);
+    free(command);

 
     if (argvarray != NULL) {
        for (i = 0; argvarray[i] != NULL; i++)
 
     if (argvarray != NULL) {
        for (i = 0; argvarray[i] != NULL; i++)


@@ -200,8 +199,8 @@ argsplit_insert(struct msgs_array *msgs, char *command, char **program)
      */
 
     if (msgs->size + argp >= msgs->max) {
      */
 
     if (msgs->size + argp >= msgs->max) {

-       msgs->max += MAXMSGS > argp ? MAXMSGS : argp;
-       msgs->msgs = mh_xrealloc(msgs->msgs, msgs->max * sizeof(*msgs->msgs));
+        msgs->max += max(MAXMSGS, argp);
+        msgs->msgs = mh_xrealloc(msgs->msgs, msgs->max * sizeof(*msgs->msgs));

     }
 
     for (i = msgs->size - 1; i >= 0; i--)
     }
 
     for (i = msgs->size - 1; i >= 0; i--)