X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;h=877bdef2d814e20e95456adb85e213ab37637d40;hp=9c74f04fbc17dbf17a0e0cec679544c1d37a732f;hb=a8984c0e490cda653615bc0e1d4743ad8fe7a2a7;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 9c74f04..877bdef 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -88,8 +88,7 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 					width = MAXSCANL;
 			}
 			dat[3] = slwidth = width;
-			scanl = (char *) mh_xmalloc((size_t) SCAN_CHARWIDTH *
-					(slwidth + 2));  /* probably for \n and \0 */
+			scanl = mh_xcalloc(slwidth + 2, SCAN_CHARWIDTH);  /* probably for \n and \0 */
 			/* Compile format string */
 			ncomps = fmt_compile(fmtstr, &fmt) + 1;
 			FINDCOMP(datecomp, "date");
@@ -98,20 +97,14 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 			datecomp = NULL;
 		}
 
-		nxtbuf = compbuffers = (char **) calloc((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),
-				sizeof(struct comp *));
-		if (!used_buf)
-			adios(EX_OSERR, NULL, "unable to allocate component buffer stack");
+		nxtbuf = compbuffers = mh_xcalloc(ncomps, sizeof(char *));
+		used_buf = mh_xcalloc(ncomps+1, sizeof(struct comp *));
 		/* NULL-terminate array */
 		used_buf += ncomps;
 		*used_buf = NULL;
 		/* allocate space for the items */
 		for (i = ncomps; i--; )
-			*nxtbuf++ = mh_xmalloc(SBUFSIZ);
+			*nxtbuf++ = mh_xcalloc(SBUFSIZ, sizeof(char));
 	}
 
 	/*
@@ -263,7 +256,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 = mh_xcalloc(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);