X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fsortm.c;h=8f1d2ea6498dd395de71fbcecf3c1bf9b4875900;hp=802e010aa5f6b977114041b0b3630844afa077bf;hb=d4c34b4439a9dbd89664de460ed37ecddc260fb1;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/uip/sortm.c b/uip/sortm.c
index 802e010..8f1d2ea 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 = mh_xcalloc(nmsgs+1, sizeof(*dlist));
 	for (i = 0; i < nmsgs; i++)
 		dlist[i] = &smsgs[i];
 	dlist[nmsgs] = 0;
@@ -222,10 +222,9 @@ main(int argc, char **argv)
 	*/
 	if (!submajor && subjsort) {  /* already date sorted */
 		struct smsg **slist, **flist;
-		register struct smsg ***il, **fp, **dp;
+		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 ***) calloc(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,11 +243,10 @@ 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;) {
-			register struct smsg **s = il[(*dp++)->s_msg];
+			struct smsg **s = il[(*dp++)->s_msg];
 
 			/* see if we already did this guy */
 			if (! s)
@@ -267,8 +265,8 @@ main(int argc, char **argv)
 			}
 		}
 		*fp = 0;
-		free(slist);
-		free(dlist);
+		mh_free0(&slist);
+		mh_free0(&dlist);
 		dlist = flist;
 	}
 
@@ -291,14 +289,11 @@ read_hdrs(struct msgs *mp, char *datesw)
 {
 	int msgnum;
 	struct tws tb;
-	register struct smsg *s;
+	struct smsg *s;
 
 	twscopy(&tb, dlocaltimenow());
 
-	smsgs = (struct smsg *) calloc((size_t) (mp->hghsel - mp->lowsel + 2),
-			sizeof(*smsgs));
-	if (smsgs == NULL)
-		adios(EX_OSERR, NULL, "unable to allocate sort storage");
+	smsgs = mh_xcalloc(mp->hghsel - mp->lowsel + 2, sizeof(*smsgs));
 
 	s = smsgs;
 	for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++) {
@@ -322,12 +317,12 @@ read_hdrs(struct msgs *mp, char *datesw)
 static int
 get_fields(char *datesw, int msg, struct smsg *smsg)
 {
-	register int state;
+	int state;
 	int compnum;
 	char *msgnam, buf[BUFSIZ], nam[NAMESZ];
-	register struct tws *tw;
-	register char *datecomp = NULL, *subjcomp = NULL;
-	register FILE *in;
+	struct tws *tw;
+	char *datecomp = NULL, *subjcomp = NULL;
+	FILE *in;
 
 	if ((in = fopen(msgnam = m_name(msg), "r")) == NULL) {
 		admonish(msgnam, "unable to read message");
@@ -336,7 +331,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 +360,6 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 			continue;
 
 		case BODY:
-		case BODYEOF:
 		case FILEEOF:
 			break;
 
@@ -375,9 +368,9 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 			if (state == LENERR || state == FMTERR)
 				admonish(NULL, "format error in message %d (header #%d)", msg, compnum);
 			if (datecomp)
-				free(datecomp);
+				mh_free0(&datecomp);
 			if (subjcomp)
-				free(subjcomp);
+				mh_free0(&subjcomp);
 			fclose(in);
 			return (0);
 
@@ -409,8 +402,8 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 			** leading "re:", everything but letters & smash
 			** letters to lower case.
 			*/
-			register char  *cp, *cp2;
-			register unsigned char c;
+			char  *cp, *cp2;
+			unsigned char c;
 
 			cp = subjcomp;
 			cp2 = subjcomp;
@@ -439,7 +432,7 @@ get_fields(char *datesw, int msg, struct smsg *smsg)
 	}
 	fclose(in);
 	if (datecomp)
-		free(datecomp);
+		mh_free0(&datecomp);
 
 	return (1);
 }
@@ -466,7 +459,7 @@ dsort(struct smsg **a, struct smsg **b)
 static int
 subsort(struct smsg **a, struct smsg **b)
 {
-	register int i;
+	int i;
 
 	if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
 		return (i);
@@ -477,7 +470,7 @@ subsort(struct smsg **a, struct smsg **b)
 static int
 txtsort(struct smsg **a, struct smsg **b)
 {
-	register int i;
+	int i;
 
 	if ((i = strcmp((*a)->s_subj, (*b)->s_subj)))
 		return (i);