X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6b4bc4a25eaac2eddd1bef51e3f00c21f98ed32d..adb55d7a21a6b728e915a8430f818138c5cb1eee:/uip/sortm.c

diff --git a/uip/sortm.c b/uip/sortm.c
index ea6b805e..72fe0659 100644
--- a/uip/sortm.c
+++ b/uip/sortm.c
@@ -368,7 +368,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 	case FLD:
 	case FLDPLUS:
 	    compnum++;
-	    if (!mh_strcasecmp (nam, datesw)) {
+	    if (!strcasecmp (nam, datesw)) {
 		datecomp = add (buf, datecomp);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
@@ -377,7 +377,7 @@ get_fields (char *datesw, int msg, struct smsg *smsg)
 		}
 		if (!subjsort || subjcomp)
 		    break;
-	    } else if (subjsort && !mh_strcasecmp (nam, subjsort)) {
+	    } else if (subjsort && !strcasecmp (nam, subjsort)) {
 		subjcomp = add (buf, subjcomp);
 		while (state == FLDPLUS) {
 		    bufsz = sizeof buf;
@@ -565,7 +565,7 @@ static void
 rename_msgs (struct msgs *mp, struct smsg **mlist)
 {
     int i, j, old, new;
-    seqset_t tmpset;
+    bvector_t tmpset = bvector_create (0);
     char f1[BUFSIZ], tmpfil[BUFSIZ];
     char newbuf[PATH_MAX + 1];
     struct smsg *sp;
@@ -605,7 +605,7 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
 	if (rename (f1, tmpfil) == NOTOK)
 	    adios (tmpfil, "unable to rename %s to ", f1);
 
-	get_msg_flags (mp, &tmpset, old);
+	get_msg_flags (mp, tmpset, old);
 
 	rename_chain (mp, mlist, j, i);
 
@@ -620,7 +620,9 @@ rename_msgs (struct msgs *mp, struct smsg **mlist)
 	if (rename (tmpfil, m_name(new)) == NOTOK)
 	    adios (m_name(new), "unable to rename %s to", tmpfil);
 
-	set_msg_flags (mp, &tmpset, new);
+	set_msg_flags (mp, tmpset, new);
 	mp->msgflags |= SEQMOD;
     }
+
+    bvector_free (tmpset);
 }