remove cruft (Synonyms)

[apps/madmutt.git] / mutt_idna.c

diff --git a/mutt_idna.c b/mutt_idna.c
index c728e5e..686e849 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -48,7 +48,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
   /* Is this the right function?  Interesting effects with some bad identifiers! */
   if (idna_to_unicode_8z8z (in, out, 1) != IDNA_SUCCESS)
     goto notrans;
-  if (mutt_convert_string (out, "utf-8", Charset, M_ICONV_HOOK_TO) == -1)
+  if (mutt_convert_string (out, "utf-8", MCharset.charset, M_ICONV_HOOK_TO) == -1)
     goto notrans;
 
   /* 
@@ -61,7 +61,7 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
     char *t2 = NULL;
     char *tmp = m_strdup(*out);
 
-    if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+    if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
       irrev = 1;
     if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
       irrev = 1;
@@ -96,7 +96,7 @@ int mutt_local_to_idna (const char *in, char **out)
     return -1;
   }
 
-  if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+  if (mutt_convert_string (&tmp, MCharset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
     rv = -1;
   if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
     rv = -2;
@@ -151,7 +151,7 @@ int mutt_addrlist_to_idna (address_t * a, char **err)
     }
     else {
       p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
-      sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
+      sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
     }
 
     p_delete(&domain);
@@ -178,7 +178,7 @@ int mutt_addrlist_to_local (address_t * a)
 
     if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
       p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
-      sprintf (a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));       /* __SPRINTF_CHECKED__ */
+      sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
     }
 
     p_delete(&domain);
@@ -212,7 +212,7 @@ const char *mutt_addr_for_display (address_t * a)
   }
 
   p_realloc(&buff, m_strlen(tmp) + m_strlen(user) + 2);
-  sprintf (buff, "%s@%s", NONULL (user), NONULL (tmp)); /* __SPRINTF_CHECKED__ */
+  sprintf(buff, "%s@%s", NONULL (user), NONULL (tmp));
   p_delete(&tmp);
   p_delete(&user);
   p_delete(&domain);