X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1..9322ba2854211794c27fae9468768b80b767c211:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index f0d3248a..97d42e5f 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -122,7 +122,7 @@ main (int argc, char **argv)
 		subjsort = "subject";
 		continue;
 	    case NSUBJSW:
-		subjsort = (char *)0;
+		subjsort = NULL;
 		continue;
 
 	    case LIMSW:
@@ -394,10 +394,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 		      msg, compnum);
 		check_failed = 1;
 	    }
-	    if (datecomp)
-		free (datecomp);
-	    if (subjcomp)
-		free (subjcomp);
+            mh_xfree(datecomp);
+            mh_xfree(subjcomp);
 	    fclose (in);
 	    return (0);
 
@@ -451,8 +449,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 
 	    while ((c = *cp++)) {
 		if (isascii((unsigned char) c) && isalnum((unsigned char) c))
-		    *cp2++ = isupper((unsigned char) c) ?
-		    			tolower((unsigned char) c) : c;
+		    *cp2++ = tolower((unsigned char)c);
 	    }
 
 	    *cp2 = '\0';
@@ -463,8 +460,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	smsg->s_subj = subjcomp;
     }
     fclose (in);
-    if (datecomp)
-	free (datecomp);
+    mh_xfree(datecomp);
 
     return (1);
 }
@@ -477,12 +473,11 @@ dsort (struct smsg **a, struct smsg **b)
 {
     if ((*a)->s_clock < (*b)->s_clock)
 	return (-1);
-    else if ((*a)->s_clock > (*b)->s_clock)
+    if ((*a)->s_clock > (*b)->s_clock)
 	return (1);
-    else if ((*a)->s_msg < (*b)->s_msg)
+    if ((*a)->s_msg < (*b)->s_msg)
 	return (-1);
-    else
-	return (1);
+    return (1);
 }
 
 /*
@@ -506,10 +501,9 @@ txtsort (struct smsg **a, struct smsg **b)
 
     if ((i = strcmp ((*a)->s_subj, (*b)->s_subj)))
 	return (i);
-    else if ((*a)->s_msg < (*b)->s_msg)
+    if ((*a)->s_msg < (*b)->s_msg)
 	return (-1);
-    else
-	return (1);
+    return (1);
 }
 
 static void
@@ -521,7 +515,7 @@ rename_chain (struct msgs *mp, struct smsg **mlist, int msg, int endmsg)
 
     for (;;) {
 	nxt = mlist[msg] - smsgs;	/* mlist[msg] is a ptr into smsgs */
-	mlist[msg] = (struct smsg *)0;
+	mlist[msg] = NULL;
 	old = smsgs[nxt].s_msg;
 	new = smsgs[msg].s_msg;
 	strncpy (oldname, m_name (old), sizeof(oldname));