remove unnecessary casts

[mmh] / uip / mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 4885572..d3f543f 100644 (file)
--- 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 = mh_xcalloc(1, sizeof(*ct));
 
        ct->c_fp = in;
        ct->c_file = getcpy(file);
@@ -476,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;
@@ -578,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';
@@ -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 = 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 = 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 = 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 = mh_xcalloc(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 = 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 = mh_xcalloc(1, sizeof(*ce));
 
        ct->c_cefile     = ce;
        ct->c_ceopenfnx  = openfnx;