/* 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))
/* 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", mod_cset.charset, M_ICONV_HOOK_TO) == -1)
goto notrans;
/*
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, mod_cset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
irrev = 1;
if (!irrev && idna_to_ascii_8z (tmp, &t2, 1) != IDNA_SUCCESS)
irrev = 1;
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);
return -1;
}
- if (mutt_convert_string (&tmp, Charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
+ if (mutt_convert_string (&tmp, mod_cset.charset, "utf-8", M_ICONV_HOOK_FROM) == -1)
rv = -1;
if (!rv && idna_to_ascii_8z (tmp, out, 1) != IDNA_SUCCESS)
rv = -2;
*out = m_strdup(in);
}
return rv;
-}
-
+#else
+ *out = m_strdup(in);
+ return 0;
#endif
-
+}
/* higher level functions */