Replace free() with mh_free0()
[mmh] / uip / pick.c
index 984d80b..0465ef5 100644 (file)
@@ -274,7 +274,6 @@ main(int argc, char **argv)
                        } else {
                                /* if it doesn't match, then unselect it */
                                unset_selected(mp, msgnum);
-                               mp->numsel--;
                        }
                        if (fp)
                                fclose(fp);
@@ -769,8 +768,7 @@ newnexus(int (*action)())
 {
        struct nexus *p;
 
-       if ((p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p)) == NULL)
-               adios(EX_OSERR, NULL, "unable to allocate component storage");
+       p = mh_xcalloc(1, sizeof *p);
 
        p->n_action = action;
        return p;
@@ -1254,8 +1252,7 @@ plist
                case FLD:
                case FLDPLUS:
                        if (bp != NULL) {
-                               free(bp);
-                               bp = NULL;
+                               mh_free0(&bp);
                        }
                        bp = getcpy(buf);
                        while (state == FLDPLUS) {
@@ -1274,7 +1271,7 @@ plist
                        if (state == LENERR || state == FMTERR)
                                advise(NULL, "format error in message %d", msgnum);
                        if (bp != NULL)
-                               free(bp);
+                               mh_free0(&bp);
                        return 0;
 
                default:
@@ -1291,6 +1288,6 @@ plist
                        : (twsort(tw, &n->n_tws) < 0);
 
        if (bp != NULL)
-               free(bp);
+               mh_free0(&bp);
        return state;
 }