X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt_idna.c;h=1a9bd8b279e1b65239db00b4a080d1808a5eef44;hp=c08f2f76d9656725adad7ac80763df96ec6f82bd;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235

diff --git a/mutt_idna.c b/mutt_idna.c
index c08f2f7..1a9bd8b 100644
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -7,26 +7,21 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
+#ifdef HAVE_LIBIDN
+#include <idna.h>
+#endif
 
 #include "mutt.h"
 #include "charset.h"
 #include "mutt_idna.h"
 
-#include "lib/debug.h"
-
 /* The low-level interface we use. */
 
 #ifndef HAVE_LIBIDN
 
-int mutt_idna_to_local (const char *in, char **out, int flags)
+int mutt_idna_to_local (const char *in, char **out, int flags __attribute__ ((unused)))
 {
   *out = m_strdup(in);
   return 1;
@@ -71,7 +66,6 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
     if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
       irrev = 1;
     if (!irrev && ascii_strcasecmp (t2, in)) {
-      debug_print (1, ("not reversible. in = '%s', t2 = '%s'.\n", in, t2));
       irrev = 1;
     }
 
@@ -157,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);
@@ -184,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);
@@ -218,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);
@@ -248,7 +242,7 @@ void mutt_env_to_local (ENVELOPE * e)
      if (tag) *tag = #a; e = 1; err = NULL; \
   }
 
-int mutt_env_to_idna (ENVELOPE * env, const char **tag, const char **err)
+int mutt_env_to_idna (ENVELOPE * env, const char **tag, char **err)
 {
   int e = 0;