From: Pierre Habouzit <madcoder@debian.org>
Date: Sat, 4 Nov 2006 01:38:31 +0000 (+0100)
Subject: don't hide macro.
X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=commitdiff_plain;h=261efe59606236c666af016344aeecf0b021307d

don't hide macro.

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

diff --git a/lib-mime/rfc822.c b/lib-mime/rfc822.c
index 8d19288..9009d40 100644
--- a/lib-mime/rfc822.c
+++ b/lib-mime/rfc822.c
@@ -37,8 +37,6 @@
 
 #include "mutt_idna.h"
 
-const char RFC822Specials[] = "@.,:;<>[]\\\"()";
-
 void address_wipe(address_t *addr)
 {
     p_delete(&addr->personal);
@@ -180,7 +178,7 @@ static const char *parse_quote(const char *s, static_buf *buf)
     return NULL;
 }
 
-#define is_special(x)         strchr(RFC822Specials,x)
+const char RFC822Specials[] = "@.,:;<>[]\\\"()";
 
 static const char *next_phrase(const char *s, static_buf *buf)
 {
@@ -189,13 +187,13 @@ static const char *next_phrase(const char *s, static_buf *buf)
         return parse_quote(s + 1, buf);
     }
 
-    if (is_special(*s)) {
+    if (strchr(RFC822Specials, *s)) {
         stbuf_append(buf, *s);
         return s + 1;
     }
 
     while (*s) {
-        if (ISSPACE(*s) || is_special(*s))
+        if (ISSPACE(*s) || strchr(RFC822Specials, *s))
             break;
         stbuf_append(buf, *s++);
     }
@@ -210,7 +208,7 @@ parse_mailboxdomain(const char *s, const char *nonspecial, static_buf *mbox,
     while (*s) {
         s = skipspaces(s);
 
-        if (!strchr(nonspecial, *s) && is_special(*s))
+        if (!strchr(nonspecial, *s) && strchr(RFC822Specials, *s))
             return s;
 
         if (*s == '(') {