X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhtest.c;h=cecf2ee562120dd9ff91fbcf2d41870840b2eccb;hp=dd456263796649b743a38adb305516bb6db5607c;hb=4112940aea5591648b03a81907408752c08b33aa;hpb=6e7d34c614291079de750ceda1d4f5ec537beb81

diff --git a/uip/mhtest.c b/uip/mhtest.c
index dd45626..cecf2ee 100644
--- a/uip/mhtest.c
+++ b/uip/mhtest.c
@@ -153,14 +153,14 @@ main(int argc, char **argv)
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				file = *cp == '-' ? cp : getcpy(expanddir(cp));
+				file = *cp == '-' ? cp : mh_xstrdup(expanddir(cp));
 				continue;
 
 			case OUTFILESW:
 				if (!(cp = *argp++) || (*cp == '-' && cp[1]))
 					adios(EX_USAGE, NULL, "missing argument to %s",
 							argp[-2]);
-				outfile = *cp == '-' ? cp : getcpy(expanddir(cp));
+				outfile = *cp == '-' ? cp : mh_xstrdup(expanddir(cp));
 				continue;
 
 			case VERBSW:
@@ -178,7 +178,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);
 	}
@@ -200,7 +200,7 @@ main(int argc, char **argv)
 	if ((cp = context_find(nmhstorage)) && *cp)
 		tmp = concat(cp, "/", invo_name, NULL);
 	else
-		tmp = getcpy(toabsdir(invo_name));
+		tmp = mh_xstrdup(toabsdir(invo_name));
 
 	if (file && msgs.size)
 		adios(EX_USAGE, NULL, "cannot specify msg and file at same time!");
@@ -209,7 +209,7 @@ main(int argc, char **argv)
 	** check if message is coming from file
 	*/
 	if (file) {
-		cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts));
+		cts = mh_xcalloc(2, sizeof(*cts));
 		ctp = cts;
 
 		if ((ct = parse_mime(file)))
@@ -241,8 +241,7 @@ main(int argc, char **argv)
 				exit(EX_USAGE);
 		seq_setprev(mp);  /* set the previous-sequence */
 
-		cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
-				sizeof(*cts));
+		cts = mh_xcalloc(mp->numsel + 1, sizeof(*cts));
 		ctp = cts;
 
 		for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -287,8 +286,7 @@ main(int argc, char **argv)
 	for (ctp = cts; *ctp; ctp++)
 		free_content(*ctp);
 
-	free((char *) cts);
-	cts = NULL;
+	mh_free0(&cts);
 
 	/* If reading from a folder, do some updating */
 	if (mp) {