X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=b7b869401d25292b0b049cd804a41e88252bcd9a;hp=488557281a2553ea7b70e714ea3f06f3ea69fa08;hb=7a13a5266a14f1c6a13752db9292cd40c1211fba;hpb=6e27d395a60fe59a274edc47989b9b8127359f36

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 4885572..b7b8694 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -238,8 +238,7 @@ get_content(FILE *in, char *file, int toplevel)
 	HF hp;
 
 	/* allocate the content structure */
-	if (!(ct = (CT) mh_xcalloc(1, sizeof(*ct))))
-		adios(EX_OSERR, NULL, "out of memory");
+	ct = (CT) mh_xcalloc(1, sizeof(*ct));
 
 	ct->c_fp = in;
 	ct->c_file = getcpy(file);
@@ -977,8 +976,7 @@ InitText(CT ct)
 	ct->c_subtype = kv->kv_value;
 
 	/* allocate text character set structure */
-	if ((t = (struct text *) mh_xcalloc(1, sizeof(*t))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	t = (struct text *) mh_xcalloc(1, sizeof(*t));
 	ct->c_ctparams = (void *) t;
 
 	/* scan for charset parameter */
@@ -1059,8 +1057,7 @@ InitMultiPart(CT ct)
 	}
 
 	/* allocate primary structure for multipart info */
-	if ((m = (struct multipart *) mh_xcalloc(1, sizeof(*m))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	m = (struct multipart *) mh_xcalloc(1, sizeof(*m));
 	ct->c_ctparams = (void *) m;
 
 	/* check if boundary parameter contains only whitespace characters */
@@ -1103,9 +1100,7 @@ InitMultiPart(CT ct)
 			if (strcmp(buffer + 2, m->mp_start)!=0)
 				continue;
 next_part:
-			if ((part = (struct part *) mh_xcalloc(1, sizeof(*part)))
-					== NULL)
-				adios(EX_OSERR, NULL, "out of memory");
+			part = (struct part *) mh_xcalloc(1, sizeof(*part));
 			*next = part;
 			next = &part->mp_next;
 
@@ -1219,8 +1214,7 @@ reverse_parts(CT ct)
 		i++;
 
 	/* allocate array of pointers to the parts */
-	if (!(base = (struct part **) mh_xcalloc((size_t) (i + 1), sizeof(*base))))
-		adios(EX_OSERR, NULL, "out of memory");
+	base = (struct part **) mh_xcalloc((size_t) (i + 1), sizeof(*base));
 	bmp = base;
 
 	/* point at all the parts */
@@ -1276,8 +1270,7 @@ InitMessage(CT ct)
 		char **ap, **ep;
 		struct partial *p;
 
-		if ((p = (struct partial *) mh_xcalloc(1, sizeof(*p))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+		p = (struct partial *) mh_xcalloc(1, sizeof(*p));
 		ct->c_ctparams = (void *) p;
 
 		/*
@@ -1389,8 +1382,7 @@ init_encoding(CT ct, OpenCEFunc openfnx)
 {
 	CE ce;
 
-	if ((ce = (CE) mh_xcalloc(1, sizeof(*ce))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ce = (CE) mh_xcalloc(1, sizeof(*ce));
 
 	ct->c_cefile     = ce;
 	ct->c_ceopenfnx  = openfnx;