X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=sort.c;h=93ba2e45d30a6f2364cf8f2bde000c6b58c6ae25;hb=a8477ebaa09990b3688164cbe5cf661c4189541d;hp=20bc777a1c2094e51cc79ad32b11d0351b6bfe5d;hpb=0f44dc85fc1280372ffab911d701e703d803fb4b;p=apps%2Fmadmutt.git

diff --git a/sort.c b/sort.c
index 20bc777..93ba2e4 100644
--- a/sort.c
+++ b/sort.c
@@ -81,7 +81,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 +122,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 +145,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 +213,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 (str_cmp (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 = str_cmp (aptr, bptr);
     if (result == 0)
       AUXSORT (result, a, b);
   }