X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/3b6170b27ba8fedbb4d67d2842bfaa38d4417962..3fce9d1fcda568cea3745f5853c1abdc5fe909df:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 1546f75a..9d661f10 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -7,6 +7,7 @@
 
 #include <h/mh.h>
 #include <h/tws.h>
+#include "h/done.h"
 #include <h/utils.h>
 #include "sbr/m_maildir.h"
 
@@ -214,7 +215,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_xmalloc ((nmsgs+1) * sizeof(*dlist));
     for (i = 0; i < nmsgs; i++)
 	dlist[i] = &smsgs[i];
     dlist[nmsgs] = 0;
@@ -230,7 +231,7 @@ main (int argc, char **argv)
     }
 
     /* first sort by date, or by subject-major, date-minor */
-    qsort ((char *) dlist, nmsgs, sizeof(*dlist),
+    qsort (dlist, nmsgs, sizeof(*dlist),
 	    (qsort_comp) (submajor && subjsort ? txtsort : dsort));
 
     /*
@@ -242,9 +243,9 @@ main (int argc, char **argv)
 	struct smsg **slist, **flist;
 	struct smsg ***il, **fp, **dp;
 
-	slist = (struct smsg **) mh_xmalloc ((nmsgs+1) * sizeof(*slist));
-	memcpy((char *)slist, (char *)dlist, (nmsgs+1)*sizeof(*slist));
-	qsort((char *)slist, nmsgs, sizeof(*slist), (qsort_comp) subsort);
+	slist = mh_xmalloc ((nmsgs+1) * sizeof(*slist));
+	memcpy(slist, dlist, (nmsgs+1)*sizeof(*slist));
+	qsort(slist, nmsgs, sizeof(*slist), (qsort_comp) subsort);
 
 	/*
 	 * make an inversion list so we can quickly find
@@ -258,7 +259,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_xmalloc ((nmsgs+1) * sizeof(*flist));
 	fp = flist;
 	for (dp = dlist; *dp;) {
 	    struct smsg **s = il[(*dp++)->s_msg];
@@ -321,7 +322,7 @@ read_hdrs (struct msgs *mp, char *datesw)
 	}
     }
     s->s_msg = 0;
-    return(s - smsgs);
+    return s - smsgs;
 }
 
 
@@ -343,7 +344,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 
     if ((in = fopen (msgnam = m_name (msg), "r")) == NULL) {
 	admonish (msgnam, "unable to read message");
-	return (0);
+	return 0;
     }
     gstate = m_getfld_state_init(in);
     for (compnum = 1;;) {
@@ -390,10 +391,10 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 		      msg, compnum);
 		check_failed = 1;
 	    }
-            mh_xfree(datecomp);
-            mh_xfree(subjcomp);
+            free(datecomp);
+            free(subjcomp);
 	    fclose (in);
-	    return (0);
+	    return 0;
 
 	default:
 	    adios (NULL, "internal error -- you lose");
@@ -453,9 +454,9 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	smsg->s_subj = subjcomp;
     }
     fclose (in);
-    mh_xfree(datecomp);
+    free(datecomp);
 
-    return (1);
+    return 1;
 }
 
 /*
@@ -465,12 +466,12 @@ static int
 dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)
-	return (-1);
+	return -1;
     if ((*a)->s_clock > (*b)->s_clock)
-	return (1);
+	return 1;
     if ((*a)->s_msg < (*b)->s_msg)
-	return (-1);
-    return (1);
+	return -1;
+    return 1;
 }
 
 /*
@@ -482,9 +483,9 @@ subsort (struct smsg **a, struct smsg **b)
     int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
-	return (i);
+	return i;
 
-    return (dsort (a, b));
+    return dsort(a, b);
 }
 
 static int
@@ -493,10 +494,10 @@ txtsort (struct smsg **a, struct smsg **b)
     int i;
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
-	return (i);
+	return i;
     if ((*a)->s_msg < (*b)->s_msg)
-	return (-1);
-    return (1);
+	return -1;
+    return 1;
 }
 
 static void