projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add free_field as standard for struct field
[mmh]
/
uip
/
mhparse.c
diff --git
a/uip/mhparse.c
b/uip/mhparse.c
index
b144c37
..
04333f4
100644
(file)
--- a/
uip/mhparse.c
+++ b/
uip/mhparse.c
@@
-232,14
+232,13
@@
static CT
get_content(FILE *in, char *file, int toplevel)
{
enum state state;
get_content(FILE *in, char *file, int toplevel)
{
enum state state;
- struct field f = {{0}};
+ struct field f = free_field;
int compnum;
CT ct;
HF hp;
/* allocate the content structure */
int compnum;
CT ct;
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);
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 LENERR2:
case FMTERR2:
- case ERR2:
+ case IOERR2:
adios(EX_DATAERR, NULL, "message format error in component #%d",
compnum);
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 */
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 */
ct->c_ctparams = (void *) t;
/* scan for charset parameter */
@@
-1046,8
+1044,7
@@
InitMultiPart(CT ct)
}
/* allocate primary structure for multipart info */
}
/* 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 */
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 (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;
*next = part;
next = &part->mp_next;
@@
-1206,8
+1201,7
@@
reverse_parts(CT ct)
i++;
/* allocate array of pointers to the parts */
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 */
bmp = base;
/* point at all the parts */
@@
-1263,8
+1257,7
@@
InitMessage(CT ct)
char **ap, **ep;
struct partial *p;
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;
/*
ct->c_ctparams = (void *) p;
/*
@@
-1376,8
+1369,7
@@
init_encoding(CT ct, OpenCEFunc openfnx)
{
CE ce;
{
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;
ct->c_cefile = ce;
ct->c_ceopenfnx = openfnx;