X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fscansbr.c;fp=uip%2Fscansbr.c;h=feef5c0495be89910ff621cdf9b4651ec6aabf67;hp=50b250e558ec086590a99ac015c8f824a3b88868;hb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee;hpb=4cc601f996579386ce4f4937b9b72b7b3d891107

diff --git a/uip/scansbr.c b/uip/scansbr.c
index 50b250e..feef5c0 100644
--- a/uip/scansbr.c
+++ b/uip/scansbr.c
@@ -74,8 +74,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");
@@ -129,7 +128,7 @@ scan(FILE *inb, int innum, int outnum, char *fmtstr, int width, int curflg,
 						free(cptr->c_text);
 						cptr->c_text = NULL;
 					}
-					cptr->c_text = getcpy(f.value);
+					cptr->c_text = mh_xstrdup(f.value);
 					cp = cptr->c_text + strlen(cptr->c_text) - 1;
 					for (; cp >= cptr->c_text; cp--) {
 						if (isspace(*cp)) {
@@ -252,7 +251,7 @@ finished:
 		if (datecomp && !datecomp->c_text) {
 			if (!datecomp->c_text) {
 				if (!datecomp->c_tws)
-					datecomp->c_tws = (struct tws *) mh_xcalloc((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);