X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/177f020f122827214159c46dcfe7ded1e3c8d1c3..6fd1d18f:/sbr/arglist.c?ds=sidebyside diff --git a/sbr/arglist.c b/sbr/arglist.c index 328d9e9c..59d311b2 100644 --- a/sbr/arglist.c +++ b/sbr/arglist.c @@ -50,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 @@ -131,7 +131,7 @@ arglist_free(char *command, char **argvarray) { int i; - mh_xfree(command); + free(command); if (argvarray != NULL) { for (i = 0; argvarray[i] != NULL; i++) @@ -199,8 +199,8 @@ argsplit_insert(struct msgs_array *msgs, char *command, char **program) */ 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--)