X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fpick.c;h=1df59b186f3fae1d7ad09b6a559f581d9a136855;hp=320db1981a74a7261c4ff5b86c33873067b20017;hb=b6823062c9806496b39ff12bf1fbe43ae127c96c;hpb=7a13a5266a14f1c6a13752db9292cd40c1211fba

diff --git a/uip/pick.c b/uip/pick.c
index 320db19..1df59b1 100644
--- a/uip/pick.c
+++ b/uip/pick.c
@@ -197,7 +197,7 @@ main(int argc, char **argv)
 			if (folder)
 				adios(EX_USAGE, NULL, "only one folder at a time!");
 			else
-				folder = getcpy(expandfol(cp));
+				folder = mh_xstrdup(expandfol(cp));
 		} else
 			app_msgarg(&msgs, cp);
 	}
@@ -731,7 +731,7 @@ pattern: ;
 			padvise(NULL, "pattern error in %s %s", argp[-2], cp);
 			return NULL;
 		}
-		n->n_patbuf = getcpy(dp);
+		n->n_patbuf = mh_xstrdup(dp);
 		return n;
 
 	case PROTHR:
@@ -768,7 +768,7 @@ newnexus(int (*action)())
 {
 	struct nexus *p;
 
-	p = (struct nexus *) mh_xcalloc((size_t) 1, sizeof *p);
+	p = mh_xcalloc(1, sizeof *p);
 
 	p->n_action = action;
 	return p;
@@ -1252,10 +1252,9 @@ plist
 		case FLD:
 		case FLDPLUS:
 			if (bp != NULL) {
-				free(bp);
-				bp = NULL;
+				mh_free0(&bp);
 			}
-			bp = getcpy(buf);
+			bp = mh_xstrdup(buf);
 			while (state == FLDPLUS) {
 				state = m_getfld(state, name, buf,
 						sizeof buf, fp);
@@ -1272,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:
@@ -1289,6 +1288,6 @@ plist
 			: (twsort(tw, &n->n_tws) < 0);
 
 	if (bp != NULL)
-		free(bp);
+		mh_free0(&bp);
 	return state;
 }