X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Fsortm.c;h=470fa8b39a647cda4fa735c7dc7210762fcd342c;hb=b78007de9802005825390bee71dfce2306b42519;hp=5d15ed68d40099dec990e1cf9dc9b97994646aa4;hpb=7a13a5266a14f1c6a13752db9292cd40c1211fba;p=mmh

diff --git a/uip/sortm.c b/uip/sortm.c
index 5d15ed6..470fa8b 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -197,7 +197,7 @@ main(int argc, char **argv)
 	/*
 	** sort a list of pointers to our "messages to be sorted".
 	*/
-	dlist = (struct smsg **) mh_xcalloc((size_t) (nmsgs+1), sizeof(*dlist));
+	dlist = mh_xcalloc(nmsgs+1, sizeof(*dlist));
 	for (i = 0; i < nmsgs; i++)
 		dlist[i] = &smsgs[i];
 	dlist[nmsgs] = 0;
@@ -224,8 +224,7 @@ main(int argc, char **argv)
 		struct smsg **slist, **flist;
 		struct smsg ***il, **fp, **dp;
 
-		slist = (struct smsg **)
-				mh_xmalloc((nmsgs+1) * sizeof(*slist));
+		slist = mh_xcalloc(nmsgs+1, sizeof(*slist));
 		memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));
 		qsort((char *)slist, nmsgs, sizeof(*slist),
 				(qsort_comp) subsort);
@@ -235,7 +234,7 @@ main(int argc, char **argv)
 		** the collection of messages with the same subj
 		** given a message number.
 		*/
-		il = (struct smsg ***) mh_xcalloc(mp->hghsel+1, sizeof(*il));
+		il = mh_xcalloc(mp->hghsel+1, sizeof(*il));
 		if (! il)
 			adios(EX_OSERR, NULL, "couldn't allocate msg list");
 		for (i = 0; i < nmsgs; i++)
@@ -244,8 +243,7 @@ main(int argc, char **argv)
 		** make up the final list, chronological but with
 		** all the same subjects grouped together.
 		*/
-		flist = (struct smsg **)
-				mh_xmalloc((nmsgs+1) * sizeof(*flist));
+		flist = mh_xcalloc(nmsgs+1, sizeof(*flist));
 		fp = flist;
 		for (dp = dlist; *dp;) {
 			struct smsg **s = il[(*dp++)->s_msg];
@@ -295,8 +293,7 @@ read_hdrs(struct msgs *mp, char *datesw)
 
 	twscopy(&tb, dlocaltimenow());
 
-	smsgs = (struct smsg *) mh_xcalloc((size_t) (mp->hghsel - mp->lowsel + 2),
-			sizeof(*smsgs));
+	smsgs = mh_xcalloc(mp->hghsel - mp->lowsel + 2, sizeof(*smsgs));
 
 	s = smsgs;
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {