X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhbuild.c;h=76826c32099c9e0b6675bcf6d47b531e466c76c2;hp=01acdb77e030120f951812faafd9efb8fa411ae9;hb=7a13a5266a14f1c6a13752db9292cd40c1211fba;hpb=6e27d395a60fe59a274edc47989b9b8127359f36

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index 01acdb7..76826c3 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -330,8 +330,7 @@ build_mime(char *infile)
 	/*
 	** Allocate space for primary (outside) content
 	*/
-	if ((ct = (CT) mh_xcalloc(1, sizeof(*ct))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ct = (CT) mh_xcalloc(1, sizeof(*ct));
 
 	/*
 	** Allocate structure for handling decoded content
@@ -435,8 +434,7 @@ build_mime(char *infile)
 	ct->c_subtype = MULTI_MIXED;
 	ct->c_file = getcpy(infile);
 
-	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;
 	pp = &m->mp_parts;
 
@@ -455,8 +453,7 @@ build_mime(char *infile)
 		if (!p)
 			continue;
 
-		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));
 		*pp = part;
 		pp = &part->mp_next;
 		part->mp_part = p;
@@ -536,8 +533,7 @@ init_decoded_content(CT ct)
 {
 	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  = open7Bit;  /* since unencoded */
@@ -597,8 +593,7 @@ user_content(FILE *in, char *file, char *buf, CT *ctp)
 	}
 
 	/* allocate basic Content structure */
-	if ((ct = (CT) mh_xcalloc(1, sizeof(*ct))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+	ct = (CT) mh_xcalloc(1, sizeof(*ct));
 	*ctp = ct;
 
 	/* allocate basic structure for handling decoded content */
@@ -906,9 +901,7 @@ use_forw:
 			ct->c_type = CT_MULTIPART;
 			ct->c_subtype = MULTI_DIGEST;
 
-			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;
 			pp = &m->mp_parts;
 
@@ -918,9 +911,7 @@ use_forw:
 					CT p;
 					CE pe;
 
-					if ((p = (CT) mh_xcalloc(1, sizeof(*p)))
-							== NULL)
-						adios(EX_OSERR, NULL, "out of memory");
+					p = (CT) mh_xcalloc(1, sizeof(*p));
 					init_decoded_content(p);
 					pe = p->c_cefile;
 					if (get_ctinfo("message/rfc822", p, 0)
@@ -934,8 +925,7 @@ use_forw:
 							msgnum);
 					pe->ce_file = getcpy(buffer);
 
-					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));
 					*pp = part;
 					pp = &part->mp_next;
 					part->mp_part = p;
@@ -994,8 +984,7 @@ use_forw:
 		ct->c_type = CT_MULTIPART;
 		ct->c_subtype = vrsn;
 
-		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;
 
 		pp = &m->mp_parts;
@@ -1011,9 +1000,7 @@ use_forw:
 			if (!p)
 				continue;
 
-			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));
 			*pp = part;
 			pp = &part->mp_next;
 			part->mp_part = p;