Use booleans, hide stupid private flag.

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/mutt_idna.c b/mutt_idna.c
index 4c9dc50..918aa26 100644 (file)
--- a/mutt_idna.c
+++ b/mutt_idna.c
@@ -19,7 +19,7 @@
 
 /* The low-level interface we use. */
 
-static int mutt_idna_to_local (const char *in, char **out, int flags)
+static int mutt_idna_to_local(const char *in, char **out, bool nonreverseok)
 {
 #ifdef HAVE_LIBIDN
   *out = NULL;
@@ -41,7 +41,7 @@ static int mutt_idna_to_local (const char *in, char **out, int flags)
    * domain name. 
    */
 
-  if ((flags & MI_MAY_BE_IRREVERSIBLE) == 0) {
+  if (nonreverseok) {
     int irrev = 0;
     char *t2 = NULL;
     char *tmp = m_strdup(*out);
@@ -164,7 +164,7 @@ int mutt_addrlist_to_local (address_t * a)
     if (mbox_to_udomain (a->mailbox, &user, &domain) == -1)
       continue;
 
-    if (mutt_idna_to_local (domain, &tmp, 0) == 0) {
+    if (mutt_idna_to_local(domain, &tmp, false) == 0) {
       p_realloc(&a->mailbox, m_strlen(user) + m_strlen(tmp) + 2);
       sprintf(a->mailbox, "%s@%s", NONULL (user), NONULL (tmp));
     }
@@ -192,7 +192,7 @@ const char *mutt_addr_for_display (address_t * a)
 
   if (mbox_to_udomain (a->mailbox, &user, &domain) != 0)
     return a->mailbox;
-  if (mutt_idna_to_local (domain, &tmp, MI_MAY_BE_IRREVERSIBLE) != 0) {
+  if (mutt_idna_to_local (domain, &tmp, true) != 0) {
     p_delete(&user);
     p_delete(&domain);
     p_delete(&tmp);

diff --git a/mutt_idna.h b/mutt_idna.h
index 15dec33..5acc31d 100644 (file)
--- a/mutt_idna.h
+++ b/mutt_idna.h
@@ -12,8 +12,6 @@
 
 #include <lib-mime/mime.h>
 
-#define MI_MAY_BE_IRREVERSIBLE         (1 << 0)
-
 int mutt_addrlist_to_idna (address_t *, char **);
 int mutt_addrlist_to_local (address_t *);