X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=1419dd96c8eda6f8d939ff537e257447f3cf37e1;hp=5078717041064ed2d702d1f69b20d5f635a0ff55;hb=d5d56308b49c3f157a17125415312f0c13e1e25b;hpb=23002a877577341cfd68687e58348e0ca01b1ac5

diff --git a/mutt_idna.c b/mutt_idna.c
index 5078717..1419dd9 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -12,15 +12,14 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
-#include "ascii.h"
 #include "charset.h"
 #include "mutt_idna.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 /* The low-level interface we use. */
@@ -29,13 +28,13 @@
 
 int mutt_idna_to_local (const char *in, char **out, int flags)
 {
-  *out = str_dup (in);
+  *out = m_strdup(in);
   return 1;
 }
 
 int mutt_local_to_idna (const char *in, char **out)
 {
-  *out = str_dup (in);
+  *out = m_strdup(in);
   return 0;
 }
 
@@ -65,7 +64,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
   if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
     int irrev = 0;
     char *t2 = NULL;
-    char *tmp = str_dup (*out);
+    char *tmp = m_strdup(*out);
 
     if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
       irrev = 1;
@@ -87,14 +86,14 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
 
 notrans:
   p_delete(out);
-  *out = str_dup (in);
+  *out = m_strdup(in);
   return 1;
 }
 
 int mutt_local_to_idna (const char *in, char **out)
 {
   int rv = 0;
-  char *tmp = str_dup (in);
+  char *tmp = m_strdup(in);
 
   *out = NULL;
 
@@ -111,7 +110,7 @@ int mutt_local_to_idna (const char *in, char **out)
   p_delete(&tmp);
   if (rv < 0) {
     p_delete(out);
-    *out = str_dup (in);
+    *out = m_strdup(in);
   }
   return rv;
 }
@@ -132,11 +131,11 @@ static int mbox_to_udomain (const char *mbx, char **user, char **domain)
   if (!p || !p[1])
     return -1;
   *user = p_dupstr(mbx, p - mbx);
-  *domain = str_dup (p + 1);
+  *domain = m_strdup(p + 1);
   return 0;
 }
 
-int mutt_addrlist_to_idna (ADDRESS * a, char **err)
+int mutt_addrlist_to_idna (address_t * a, const char **err)
 {
   char *user = NULL, *domain = NULL;
   char *tmp = NULL;
@@ -154,10 +153,10 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
     if (mutt_local_to_idna (domain, &tmp) < 0) {
       e = 1;
       if (err)
-        *err = str_dup (domain);
+        *err = m_strdup(domain);
     }
     else {
-      mem_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+      p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
@@ -172,7 +171,7 @@ int mutt_addrlist_to_idna (ADDRESS * a, char **err)
   return 0;
 }
 
-int mutt_addrlist_to_local (ADDRESS * a)
+int mutt_addrlist_to_local (address_t * a)
 {
   char *user, *domain;
   char *tmp = NULL;
@@ -184,7 +183,7 @@ int mutt_addrlist_to_local (ADDRESS * a)
       continue;
 
     if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
-      mem_realloc (&a->mailbox, str_len (user) + str_len (tmp) + 2);
+      p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
       sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
     }
 
@@ -197,7 +196,7 @@ int mutt_addrlist_to_local (ADDRESS * a)
 }
 
 /* convert just for displaying purposes */
-const char *mutt_addr_for_display (ADDRESS * a)
+const char *mutt_addr_for_display (address_t * a)
 {
   static char *buff = NULL;
   char *tmp = NULL;
@@ -218,7 +217,7 @@ const char *mutt_addr_for_display (ADDRESS * a)
     return a->mailbox;
   }
 
-  mem_realloc (&buff, str_len (tmp) + str_len (user) + 2);
+  p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
   sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
   p_delete(&tmp);
   p_delete(&user);