No error-checking for error-checking alloc functions
[mmh] / uip / scansbr.c
index 9c74f04..d985a5c 100644 (file)
@@ -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);