X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fsortm.c;h=5d15ed68d40099dec990e1cf9dc9b97994646aa4;hb=e9df3f1a429daaca00025e76ce8850d104311ee1;hp=0d02af9f8985e8662be7088ae960dcd656e425fa;hpb=5ba9c2f13fedf1d8d6ed907ef1f505616290efaa;p=mmh

diff --git a/uip/sortm.c b/uip/sortm.c
index 0d02af9..5d15ed6 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_xmalloc((nmsgs+1) * sizeof(*dlist));
+	dlist = (struct smsg **) mh_xcalloc((size_t) (nmsgs+1), sizeof(*dlist));
 	for (i = 0; i < nmsgs; i++)
 		dlist[i] = &smsgs[i];
 	dlist[nmsgs] = 0;
@@ -235,7 +235,7 @@ main(int argc, char **argv)
 		** the collection of messages with the same subj
 		** given a message number.
 		*/
-		il = (struct smsg ***) calloc(mp->hghsel+1, sizeof(*il));
+		il = (struct smsg ***) mh_xcalloc(mp->hghsel+1, sizeof(*il));
 		if (! il)
 			adios(EX_OSERR, NULL, "couldn't allocate msg list");
 		for (i = 0; i < nmsgs; i++)
@@ -295,10 +295,8 @@ read_hdrs(struct msgs *mp, char *datesw)
 
 	twscopy(&tb, dlocaltimenow());
 
-	smsgs = (struct smsg *) calloc((size_t) (mp->hghsel - mp->lowsel + 2),
+	smsgs = (struct smsg *) mh_xcalloc((size_t) (mp->hghsel - mp->lowsel + 2),
 			sizeof(*smsgs));
-	if (smsgs == NULL)
-		adios(EX_OSERR, NULL, "unable to allocate sort storage");
 
 	s = smsgs;
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -336,7 +334,6 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 	for (compnum = 1, state = FLD;;) {
 		switch (state = m_getfld(state, nam, buf, sizeof(buf), in)) {
 		case FLD:
-		case FLDEOF:
 		case FLDPLUS:
 			compnum++;
 			if (!mh_strcasecmp(nam, datesw)) {
@@ -366,7 +363,6 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 			continue;
 
 		case BODY:
-		case BODYEOF:
 		case FILEEOF:
 			break;