X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhparse.c;h=3522a97b2d5c84a22299379771de2a6e29bef757;hp=f520e03de064f5382771bc19c2f0fd0cf9fa3066;hb=10eff860a28b96582526eb739fd0a55441669938;hpb=1e9a7f8082f2ea4b496827be6b9ebbc4ac145839

diff --git a/uip/mhparse.c b/uip/mhparse.c
index f520e03..3522a97 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) calloc(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);
@@ -253,7 +252,6 @@ get_content(FILE *in, char *file, int toplevel)
 		switch (state = m_getfld(state, name, buf, sizeof(buf), in)) {
 		case FLD:
 		case FLDPLUS:
-		case FLDEOF:
 			compnum++;
 
 			/* get copies of the buffers */
@@ -270,15 +268,10 @@ get_content(FILE *in, char *file, int toplevel)
 			/* Now add the header data to the list */
 			add_header(ct, np, vp);
 
-			/* continue, if this isn't the last header field */
-			if (state != FLDEOF) {
-				ct->c_begin = ftell(in) + 1;
-				continue;
-			}
-			/* else fall... */
+			ct->c_begin = ftell(in) + 1;
+			continue;
 
 		case BODY:
-		case BODYEOF:
 			ct->c_begin = ftell(in) - strlen(buf);
 			break;
 
@@ -482,7 +475,7 @@ add_header(CT ct, char *name, char *value)
 	HF hp;
 
 	/* allocate header field structure */
-	hp = mh_xmalloc(sizeof(*hp));
+	hp = mh_xcalloc(1, sizeof(*hp));
 
 	/* link data into header structure */
 	hp->name = name;
@@ -584,7 +577,7 @@ extract_name_value(char *name_suffix, char *value) {
 		for (; *cp != '"'; ++cp)
 			;
 
-		extracted_name_value = mh_xmalloc(cp - name_suffix_begin + 1);
+		extracted_name_value = mh_xcalloc(cp - name_suffix_begin + 1, sizeof(char));
 		memcpy(extracted_name_value, name_suffix_begin,
 				cp - name_suffix_begin);
 		extracted_name_value[cp - name_suffix_begin] = '\0';
@@ -983,8 +976,7 @@ InitText(CT ct)
 	ct->c_subtype = kv->kv_value;
 
 	/* allocate text character set structure */
-	if ((t = (struct text *) calloc(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 */
@@ -1065,8 +1057,7 @@ InitMultiPart(CT ct)
 	}
 
 	/* allocate primary structure for multipart info */
-	if ((m = (struct multipart *) calloc(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 */
@@ -1109,9 +1100,7 @@ InitMultiPart(CT ct)
 			if (strcmp(buffer + 2, m->mp_start)!=0)
 				continue;
 next_part:
-			if ((part = (struct part *) calloc(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;
 
@@ -1225,8 +1214,7 @@ reverse_parts(CT ct)
 		i++;
 
 	/* allocate array of pointers to the parts */
-	if (!(base = (struct part **) calloc((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 */
@@ -1282,8 +1270,7 @@ InitMessage(CT ct)
 		char **ap, **ep;
 		struct partial *p;
 
-		if ((p = (struct partial *) calloc(1, sizeof(*p))) == NULL)
-		adios(EX_OSERR, NULL, "out of memory");
+		p = (struct partial *) mh_xcalloc(1, sizeof(*p));
 		ct->c_ctparams = (void *) p;
 
 		/*
@@ -1395,8 +1382,7 @@ init_encoding(CT ct, OpenCEFunc openfnx)
 {
 	CE ce;
 
-	if ((ce = (CE) calloc(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;