X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhstore.c;h=4f84570227aabdb09c619d76a8ce7d368c1ffa46;hp=1202fcbac43b77f3115bad2399bbf2420feb9d66;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=e16d5bfc58d8b0dfe61701cd4d6b1732e837d60a

diff --git a/uip/mhstore.c b/uip/mhstore.c
index 1202fcb..4f84570 100644
--- a/uip/mhstore.c
+++ b/uip/mhstore.c
@@ -261,8 +261,7 @@ main(int argc, char **argv)
 	** check if message is coming from file
 	*/
 	if (file) {
-		if (!(cts = (CT *) mh_xcalloc((size_t) 2, sizeof(*cts))))
-			adios(EX_OSERR, NULL, "out of memory");
+		cts = mh_xcalloc(2, sizeof(*cts));
 		ctp = cts;
 
 		if ((ct = parse_mime(file)))
@@ -294,9 +293,7 @@ main(int argc, char **argv)
 				exit(EX_USAGE);
 		seq_setprev(mp);  /* set the previous-sequence */
 
-		if (!(cts = (CT *) mh_xcalloc((size_t) (mp->numsel + 1),
-				sizeof(*cts))))
-			adios(EX_OSERR, NULL, "out of memory");
+		cts = mh_xcalloc(mp->numsel + 1, sizeof(*cts));
 		ctp = cts;
 
 		for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -341,8 +338,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) {
@@ -570,8 +566,7 @@ store_partial(CT ct)
 		return NOTOK;
 	}
 
-	if ((base = (CT *) mh_xcalloc((size_t) (i + 1), sizeof(*base))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	base = mh_xcalloc(i + 1, sizeof(*base));
 
 	ctq = base;
 	for (ctp = cts; *ctp; ctp++) {
@@ -617,7 +612,7 @@ missing_part:
 	ct = *ctq++;
 	if (store_content(ct, NULL) == NOTOK) {
 losing:
-		free((char *) base);
+		mh_free0(&base);
 		return NOTOK;
 	}
 
@@ -627,7 +622,7 @@ losing:
 			goto losing;
 	}
 
-	free((char *) base);
+	mh_free0(&base);
 	return OK;
 }
 
@@ -792,7 +787,7 @@ store_content(CT ct, CT p)
 		ct->c_folder = getcpy(folder);
 
 		if (cp[1])
-			free(folder);
+			mh_free0(&folder);
 
 		goto got_filename;
 	}