X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5484df03060b28526b777bb51974c5157840e90e..39a9d9d85d0f2289d8c1257251311b7cf959c700:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index fbedaf26..8aee4a97 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -390,14 +390,12 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	case LENERR:
 	case FMTERR:
 	    if (state == LENERR || state == FMTERR) {
-		admonish (NULL, "format error in message %d (header #%d)",
+		inform("format error in message %d (header #%d), continuing...",
 		      msg, compnum);
 		check_failed = 1;
 	    }
-	    if (datecomp)
-		free (datecomp);
-	    if (subjcomp)
-		free (subjcomp);
+            mh_xfree(datecomp);
+            mh_xfree(subjcomp);
 	    fclose (in);
 	    return (0);
 
@@ -415,10 +413,8 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
     if (!datecomp || (tw = dparsetime (datecomp)) == NULL) {
 	struct stat st;
 
-	advise (NULL,
-		"can't parse %s field in message %d, "
-		"will use file modification time",
-		datesw, msg);
+	inform("can't parse %s field in message %d, "
+            "will use file modification time", datesw, msg);
 	fstat (fileno (in), &st);
 	smsg->s_clock = st.st_mtime;
 	check_failed = 1;
@@ -451,8 +447,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 +458,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 +471,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 +499,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