X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=f79120689106c403c8f4d6e598b81caf5413dbea;hp=a4e984f0be2cda9bcc9b3327466f56db818c5844;hb=9f66d0f5a23ad4fe8359006fa82abdc20737ddf1;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd

diff --git a/alias.c b/alias.c
index a4e984f..f791206 100644
--- a/alias.c
+++ b/alias.c
@@ -15,7 +15,9 @@
 #include <ctype.h>
 
 #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"
@@ -23,7 +25,6 @@
 
 #include "mutt.h"
 #include "enter.h"
-#include "ascii.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
 #include "mutt_menu.h"
@@ -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;
@@ -403,7 +404,7 @@ int mutt_alias_complete (char *s, size_t buflen)
 #define min(a,b)        ((a<b)?a:b)
 
   if (s[0] != 0) {              /* avoid empty string as strstr argument */
-    memset (bestname, 0, sizeof (bestname));
+    p_clear(bestname, sizeof(bestname));
 
     while (a) {
       if (a->name && strstr (a->name, s) == a->name) {
@@ -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;