X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.c;h=8835fa9ad60bdd7247388ae9b70e7edc51a05af4;hp=d28427a06e989f80a0b2e42b82f8324829587772;hb=5b5275063730518006979a40a3ff9c994886ee3f;hpb=814a01519c9605d479201b99eb16c97b0ad8635d

diff --git a/alias.c b/alias.c
index d28427a..8835fa9 100644
--- a/alias.c
+++ b/alias.c
@@ -49,7 +49,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
       if (t) {
         i = 0;
         for (u = *expn; u; u = u->next) {
-          if (safe_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
+          if (mutt_strcmp (a->mailbox, u->data) == 0) { /* alias already found */
             debug_print(1, ("loop in alias found for '%s'\n", a->mailbox));
             i = 1;
             break;
@@ -84,10 +84,6 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
 
           mutt_gecos_name (namebuf, sizeof (namebuf), pw);
           str_replace (&a->personal, namebuf);
-
-#ifdef EXACT_ADDRESS
-          FREE (&a->val);
-#endif
         }
       }
     }
@@ -396,7 +392,7 @@ int mutt_alias_complete (char *s, size_t buflen)
       if (a->name && strstr (a->name, s) == a->name) {
         if (!bestname[0])       /* init */
           strfcpy (bestname, a->name,
-                   min (safe_strlen (a->name) + 1, sizeof (bestname)));
+                   min (mutt_strlen (a->name) + 1, sizeof (bestname)));
         else {
           for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
           bestname[i] = 0;
@@ -406,9 +402,9 @@ int mutt_alias_complete (char *s, size_t buflen)
     }
 
     if (bestname[0] != 0) {
-      if (safe_strcmp (bestname, s) != 0) {
+      if (mutt_strcmp (bestname, s) != 0) {
         /* we are adding something to the completion */
-        strfcpy (s, bestname, safe_strlen (bestname) + 1);
+        strfcpy (s, bestname, mutt_strlen (bestname) + 1);
         return 1;
       }