X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=0465ef51490980b6cdfd7e0f1decfaaeec51441b;hp=8ae58a464eb2a5a27126931ca215d1a4a55936cb;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=5d690daafbcd4ed26d19610fcc017999ee5af892

diff --git a/uip/pick.c b/uip/pick.c
index 8ae58a4..0465ef5 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -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;
@@ -1252,11 +1250,9 @@ plist
 	for (state = FLD, bp = NULL;;) {
 		switch (state = m_getfld(state, name, buf, sizeof buf, fp)) {
 		case FLD:
-		case FLDEOF:
 		case FLDPLUS:
 			if (bp != NULL) {
-				free(bp);
-				bp = NULL;
+				mh_free0(&bp);
 			}
 			bp = getcpy(buf);
 			while (state == FLDPLUS) {
@@ -1266,18 +1262,16 @@ plist
 			}
 			if (!mh_strcasecmp(name, n->n_datef))
 				break;
-			if (state != FLDEOF)
-				continue;
+			continue;
 
 		case BODY:
-		case BODYEOF:
 		case FILEEOF:
 		case LENERR:
 		case FMTERR:
 			if (state == LENERR || state == FMTERR)
 				advise(NULL, "format error in message %d", msgnum);
 			if (bp != NULL)
-				free(bp);
+				mh_free0(&bp);
 			return 0;
 
 		default:
@@ -1294,6 +1288,6 @@ plist
 			: (twsort(tw, &n->n_tws) < 0);
 
 	if (bp != NULL)
-		free(bp);
+		mh_free0(&bp);
 	return state;
 }