X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/96a2a03a1473522669e8848959c3aa380cf3d4eb..6547ca9f73c3f02b2356017bbd7ff85292f8e4a1:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index 9f95c6d2..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];