X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/aaf014c77a4fb19bdc33370f5b6af5b8497decf8..34f0ab116ad7734e96127d3cd046861a5c82c11c:/uip/mhparse.c

diff --git a/uip/mhparse.c b/uip/mhparse.c
index 7ec030ba..7e539c3a 100644
--- a/uip/mhparse.c
+++ b/uip/mhparse.c
@@ -151,7 +151,6 @@ static int openURL (CT, char **);
 static int parse_header_attrs (const char *, const char *, char **, PM *,
 			       PM *, char **);
 static size_t param_len(PM, int, size_t, int *, int *, size_t *);
-static size_t encode_param(PM, char *, size_t, size_t, size_t, int);
 static size_t normal_param(PM, char *, size_t, size_t, size_t);
 static int get_dispo (char *, CT, int);
 
@@ -295,9 +294,7 @@ get_content (FILE *in, char *file, int toplevel)
     m_getfld_state_t gstate = 0;
 
     /* allocate the content structure */
-    if (!(ct = (CT) mh_xcalloc (1, sizeof(*ct))))
-	adios (NULL, "out of memory");
-
+    ct = mh_xcalloc(1, sizeof *ct);
     ct->c_fp = in;
     ct->c_file = add (file, NULL);
     ct->c_begin = ftell (ct->c_fp) + 1;
@@ -1030,8 +1027,7 @@ InitText (CT ct)
     ct->c_subtype = ct_str_subtype (CT_TEXT, ci->ci_subtype);
 
     /* allocate text character set structure */
-    if ((t = (struct text *) mh_xcalloc (1, sizeof(*t))) == NULL)
-	adios (NULL, "out of memory");
+    t = mh_xcalloc(1, sizeof *t);
     ct->c_ctparams = (void *) t;
 
     /* scan for charset parameter */
@@ -1135,8 +1131,7 @@ InitMultiPart (CT ct)
     }
 
     /* allocate primary structure for multipart info */
-    if ((m = (struct multipart *) mh_xcalloc (1, sizeof(*m))) == NULL)
-	adios (NULL, "out of memory");
+    m = mh_xcalloc(1, sizeof *m);
     ct->c_ctparams = (void *) m;
 
     /* check if boundary parameter contains only whitespace characters */
@@ -1180,8 +1175,7 @@ InitMultiPart (CT ct)
 	    if (strcmp (bufp + 2, m->mp_start))
 		continue;
 next_part:
-	    if ((part = (struct part *) mh_xcalloc (1, sizeof(*part))) == NULL)
-		adios (NULL, "out of memory");
+	    part = mh_xcalloc(1, sizeof *part);
 	    *next = part;
 	    next = &part->mp_next;
 
@@ -1420,8 +1414,7 @@ InitMessage (CT ct)
 		PM pm;
 		struct partial *p;
 
-		if ((p = (struct partial *) mh_xcalloc (1, sizeof(*p))) == NULL)
-		    adios (NULL, "out of memory");
+		p = mh_xcalloc(1, sizeof *p);
 		ct->c_ctparams = (void *) p;
 
 		/* scan for parameters "id", "number", and "total" */
@@ -1469,8 +1462,7 @@ invalid_param:
 		CT p;
 		FILE *fp;
 
-		if ((e = (struct exbody *) mh_xcalloc (1, sizeof(*e))) == NULL)
-		    adios (NULL, "out of memory");
+		e = mh_xcalloc(1, sizeof *e);
 		ct->c_ctparams = (void *) e;
 
 		if (!ct->c_fp
@@ -3981,7 +3973,7 @@ param_len(PM pm, int index, size_t valueoff, int *encode, int *cont,
  * Output an encoded parameter string.
  */
 
-static size_t
+size_t
 encode_param(PM pm, char *output, size_t len, size_t valuelen,
 	      size_t valueoff, int index)
 {