fix idn support properly

[apps/madmutt.git] / mutt_idna.c

diff --git a/mutt_idna.c b/mutt_idna.c
index 686e849..84e470d 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -19,24 +19,9 @@
 
 /* The low-level interface we use. */
 
-#ifndef HAVE_LIBIDN
-
-int mutt_idna_to_local (const char *in, char **out, int flags __attribute__ ((unused)))
-{
-  *out = m_strdup(in);
-  return 1;
-}
-
-int mutt_local_to_idna (const char *in, char **out)
-{
-  *out = m_strdup(in);
-  return 0;
-}
-
-#else
-
-int mutt_idna_to_local (const char *in, char **out, int flags)
+static int mutt_idna_to_local (const char *in, char **out, int flags)
 {
+#ifdef HAVE_LIBIDN
   *out = NULL;
 
   if (!option (OPTUSEIDN))
@@ -80,12 +65,14 @@ int mutt_idna_to_local (const char *in, char **out, int flags)
 
 notrans:
   p_delete(out);
+#endif
   *out = m_strdup(in);
   return 1;
 }
 
-int mutt_local_to_idna (const char *in, char **out)
+static int mutt_local_to_idna (const char *in, char **out)
 {
+#ifdef HAVE_LIBIDN
   int rv = 0;
   char *tmp = m_strdup(in);
 
@@ -107,10 +94,11 @@ int mutt_local_to_idna (const char *in, char **out)
     *out = m_strdup(in);
   }
   return rv;
-}
-
+#else
+  *out = m_strdup(in);
+  return 0;
 #endif
-
+}
 
 /* higher level functions */