exit str_cmp enters m_strcmp

[apps/madmutt.git] / sort.c

diff --git a/sort.c b/sort.c
index 20bc777..b932ab1 100644 (file)
--- a/sort.c
+++ b/sort.c
@@ -11,12 +11,14 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/macros.h>
+#include <lib-lib/str.h>
+
 #include "mutt.h"
-#include "lib/str.h"
 #include "sort.h"
+#include "thread.h"
 #include "mutt_idna.h"
 
-#include "lib/intl.h"
 
 #include <stdlib.h>
 #include <string.h>
@@ -81,7 +83,7 @@ int compare_subject (const void *a, const void *b)
   else if (!(*pb)->env->real_subj)
     rc = 1;
   else
-    rc = safe_strcasecmp ((*pa)->env->real_subj, (*pb)->env->real_subj);
+    rc = str_casecmp ((*pa)->env->real_subj, (*pb)->env->real_subj);
   AUXSORT (rc, a, b);
   return (SORTCODE (rc));
 }
@@ -122,7 +124,7 @@ int compare_to (const void *a, const void *b)
   strncpy (fb, mutt_get_name ((*ppb)->env->to), sizeof (fb));
   fb[sizeof (fb) - 1] = '\0';
 
-  result = safe_strcasecmp (fa, fb);
+  result = str_casecmp (fa, fb);
   AUXSORT (result, a, b);
   return (SORTCODE (result));
 }
@@ -145,7 +147,7 @@ int compare_from (const void *a, const void *b)
   strncpy (fb, mutt_get_name ((*ppb)->env->from), sizeof (fb));
   fb[sizeof (fb) - 1] = '\0';
 
-  result = safe_strcasecmp (fa, fb);
+  result = str_casecmp (fa, fb);
   AUXSORT (result, a, b);
   return (SORTCODE (result));
 }
@@ -213,13 +215,13 @@ int compare_spam (const void *a, const void *b)
   /* If either aptr or bptr is equal to data, there is no numeric    */
   /* value for that spam attribute. In this case, compare lexically. */
   if ((aptr == (*ppa)->env->spam->data) || (bptr == (*ppb)->env->spam->data))
-    return (SORTCODE (safe_strcmp (aptr, bptr)));
+    return (SORTCODE (m_strcmp(aptr, bptr)));
 
   /* Otherwise, we have numeric value for both attrs. If these values */
   /* are equal, then we first fall back upon string comparison, then  */
   /* upon auxiliary sort.                                             */
   if (result == 0) {
-    result = safe_strcmp (aptr, bptr);
+    result = m_strcmp(aptr, bptr);
     if (result == 0)
       AUXSORT (result, a, b);
   }