X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=d985a5cab544ddf045450a24640cf3018ef78b63;hp=9c74f04fbc17dbf17a0e0cec679544c1d37a732f;hb=6e7d34c614291079de750ceda1d4f5ec537beb81;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c diff --git a/uip/scansbr.c b/uip/scansbr.c index 9c74f04..d985a5c 100644 --- a/uip/scansbr.c +++ b/uip/scansbr.c @@ -98,14 +98,10 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg, datecomp = NULL; } - nxtbuf = compbuffers = (char **) calloc((size_t) ncomps, + nxtbuf = compbuffers = (char **) mh_xcalloc((size_t) ncomps, sizeof(char *)); - if (!nxtbuf) - adios(EX_OSERR, NULL, "unable to allocate component buffers"); - used_buf = (struct comp **) calloc((size_t) (ncomps+1), + used_buf = (struct comp **) mh_xcalloc((size_t) (ncomps+1), sizeof(struct comp *)); - if (!used_buf) - adios(EX_OSERR, NULL, "unable to allocate component buffer stack"); /* NULL-terminate array */ used_buf += ncomps; *used_buf = NULL; @@ -263,7 +259,7 @@ finished: if (datecomp && !datecomp->c_text) { if (!datecomp->c_text) { if (!datecomp->c_tws) - datecomp->c_tws = (struct tws *) calloc((size_t) 1, sizeof(*datecomp->c_tws)); + datecomp->c_tws = (struct tws *) mh_xcalloc((size_t) 1, sizeof(*datecomp->c_tws)); if (!datecomp->c_tws) adios(EX_OSERR, NULL, "unable to allocate tws buffer"); *datecomp->c_tws = *dlocaltime((time_t *) &st.st_mtime);