use m_strdup and m_strlen that are inlined for efficiency

[apps/madmutt.git] / alias.c

diff --git a/alias.c b/alias.c
index 222a01c..a4e984f 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -15,9 +15,9 @@
 #include <ctype.h>
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
 #include <lib-lib/macros.h>
 
-#include "lib/str.h"
 #include "lib/rx.h"
 #include "lib/debug.h"
 
@@ -75,7 +75,7 @@ static ADDRESS *mutt_expand_aliases_r (ADDRESS * a, LIST ** expn)
 
         if (!i) {
           u = p_new(LIST, 1);
-          u->data = str_dup (a->mailbox);
+          u->data = m_strdup(a->mailbox);
           u->next = *expn;
           *expn = u;
           w = rfc822_cpy_adr (t);
@@ -257,7 +257,7 @@ retry_name:
 
   new = p_new(ALIAS, 1);
   new->self = new;
-  new->name = str_dup (buf);
+  new->name = m_strdup(buf);
 
   mutt_addrlist_to_local (adr);
 
@@ -293,7 +293,7 @@ retry_name:
     mutt_free_alias (&new);
     return;
   }
-  new->addr->personal = str_dup (buf);
+  new->addr->personal = m_strdup(buf);
 
   buf[0] = 0;
   rfc822_write_address (buf, sizeof (buf), new->addr, 1);
@@ -409,7 +409,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 (str_len (a->name) + 1, sizeof (bestname)));
+                   min (m_strlen(a->name) + 1, sizeof (bestname)));
         else {
           for (i = 0; a->name[i] && a->name[i] == bestname[i]; i++);
           bestname[i] = 0;
@@ -421,7 +421,7 @@ int mutt_alias_complete (char *s, size_t buflen)
     if (bestname[0] != 0) {
       if (str_cmp (bestname, s) != 0) {
         /* we are adding something to the completion */
-        strfcpy (s, bestname, str_len (bestname) + 1);
+        strfcpy (s, bestname, m_strlen(bestname) + 1);
         return 1;
       }