X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhparse.c;h=257bc66e914318154a612af0a0a77f26bfb6c2b0;hb=bf016a819708d2f84387843e73af51df7e19c621;hp=b144c375a2cf43e4c9f65304d06ee893eb9048c6;hpb=1e99819ed105950cd584c71fa4b2e36b038be102;p=mmh

diff --git a/uip/mhparse.c b/uip/mhparse.c
index b144c37..257bc66 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);
@@ -270,7 +269,7 @@ get_content(FILE *in, char *file, int toplevel)
 
 		case LENERR2:
 		case FMTERR2:
-		case ERR2:
+		case IOERR2:
 			adios(EX_DATAERR, NULL, "message format error in component #%d",
 					compnum);
 
@@ -964,8 +963,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 */
@@ -1046,8 +1044,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 */
@@ -1090,9 +1087,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;
 
@@ -1206,8 +1201,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 */
@@ -1263,8 +1257,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;
 
 		/*
@@ -1376,8 +1369,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;