X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frepl.c;h=cd0f6beb96a6c7bc019991f4a474bfde795a9fca;hp=f1e4bcc431dd213d30728fd5016090b3f43ffd2f;hb=b78007de9802005825390bee71dfce2306b42519;hpb=d6742b1bb19c7eca8488402484a6e4f55543d789

diff --git a/uip/repl.c b/uip/repl.c
index f1e4bcc..cd0f6be 100644
--- a/uip/repl.c
+++ b/uip/repl.c
@@ -412,15 +412,13 @@ replout(FILE *inb, char *drft, struct msgs *mp,
 	/* compile format string */
 	ncomps = fmt_compile(cp, &fmt) + 1;
 
-	nxtbuf = compbuffers = (char **)
-			mh_xcalloc((size_t) ncomps, sizeof(char *));
-	savecomp = used_buf = (struct comp **)
-			mh_xcalloc((size_t) (ncomps+1), sizeof(struct comp *));
+	nxtbuf = compbuffers = mh_xcalloc(ncomps, sizeof(char *));
+	savecomp = used_buf = mh_xcalloc(ncomps+1, sizeof(struct comp *));
 	savecomp += ncomps + 1;
 	*--savecomp = NULL;  /* point at zero'd end minus 1 */
 
 	for (i = ncomps; i--; )
-		*nxtbuf++ = mh_xmalloc(SBUFSIZ);
+		*nxtbuf++ = mh_xcalloc(SBUFSIZ, sizeof(char));
 
 	nxtbuf = compbuffers;  /* point at start */
 	tmpbuf = *nxtbuf++;
@@ -543,7 +541,7 @@ finished:
 		}
 	}
 	i = format_len + char_read + 256;
-	scanl = mh_xmalloc((size_t) i + 2);
+	scanl = mh_xcalloc(i + 2, sizeof(char));
 	dat[0] = 0;
 	dat[1] = 0;
 	dat[2] = 0;
@@ -646,7 +644,7 @@ formataddr(char *orig, char *str)
 
 	/* if we don't have a buffer yet, get one */
 	if (bufsiz == 0) {
-		buf = mh_xmalloc(BUFINCR);
+		buf = mh_xcalloc(BUFINCR, sizeof(char));
 		last_dst = buf;  /* XXX */
 		bufsiz = BUFINCR - 6;  /* leave some slop */
 		bufend = buf + bufsiz;