remove yet anoter round of str_* functions, replaced with their inlineable

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index e287551..efed62d 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -17,6 +17,7 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 
 #include "lib/rx.h"
@@ -46,7 +47,7 @@ ADDRESS *mutt_lookup_alias (const char *s)
   ALIAS *t = Aliases;
 
   for (; t; t = t->next)
-    if (!str_casecmp (s, t->name))
+    if (!m_strcasecmp(s, t->name))
       return (t->addr);
   return (NULL);                /* no such alias */
 }
@@ -66,7 +67,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
       if (t) {
         i = 0;
         for (u = *expn; u; u = u->next) {
-          if (str_cmp (a->mailbox, u->data) == 0) { /* alias already found */
+          if (m_strcmp(a->mailbox, u->data) == 0) { /* alias already found */
             debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
             i = 1;
             break;
@@ -419,7 +420,7 @@ int mutt_alias_complete (char *s, size_t buflen)
     }
 
     if (bestname[0] != 0) {
-      if (str_cmp (bestname, s) != 0) {
+      if (m_strcmp(bestname, s) != 0) {
         /* we are adding something to the completion */
         strfcpy (s, bestname, m_strlen(bestname) + 1);
         return 1;
@@ -597,7 +598,7 @@ static int alias_SortAlias (const void *a, const void *b)
 {
   ALIAS *pa = *(ALIAS **) a;
   ALIAS *pb = *(ALIAS **) b;
-  int r = str_casecmp (pa->name, pb->name);
+  int r = m_strcasecmp(pa->name, pb->name);
 
   return (RSORT (r));
 }
@@ -616,7 +617,7 @@ static int alias_SortAddress (const void *a, const void *b)
     r = 1;
   else if (pa->personal) {
     if (pb->personal)
-      r = str_casecmp (pa->personal, pb->personal);
+      r = m_strcasecmp(pa->personal, pb->personal);
     else
       r = 1;
   }