From: Richard Russon <rich@flatcap.org>
Date: Sat, 23 Jun 2018 00:54:45 +0000 (+0100)
Subject: match_addrlist
X-Git-Tag: neomutt-20180716~23^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa3480431c788b0e7d7ad5d14ad2617e1ec7be0d;p=neomutt

match_addrlist
---

diff --git a/pattern.c b/pattern.c
index fe1cbc0c2..ac16993e8 100644
--- a/pattern.c
+++ b/pattern.c
@@ -1531,7 +1531,7 @@ static int perform_or(struct Pattern *pat, enum PatternExecFlag flags,
  * @retval true One Address matches (alladdr is false)
  * @retval true All the Addresses match (alladdr is true)
  */
-static int match_addrlist(struct Pattern *pat, int match_personal, int n, ...)
+static int match_addrlist(struct Pattern *pat, bool match_personal, int n, ...)
 {
   va_list ap;
 
@@ -1885,23 +1885,23 @@ int mutt_pattern_exec(struct Pattern *pat, enum PatternExecFlag flags,
     case MUTT_SENDER:
       if (!h->env)
         return 0;
-      return (pat->not ^ match_addrlist(pat, flags & MUTT_MATCH_FULL_ADDRESS, 1,
+      return (pat->not ^ match_addrlist(pat, (flags & MUTT_MATCH_FULL_ADDRESS), 1,
                                         h->env->sender));
     case MUTT_FROM:
       if (!h->env)
         return 0;
       return (pat->not ^
-              match_addrlist(pat, flags & MUTT_MATCH_FULL_ADDRESS, 1, h->env->from));
+              match_addrlist(pat, (flags & MUTT_MATCH_FULL_ADDRESS), 1, h->env->from));
     case MUTT_TO:
       if (!h->env)
         return 0;
       return (pat->not ^
-              match_addrlist(pat, flags & MUTT_MATCH_FULL_ADDRESS, 1, h->env->to));
+              match_addrlist(pat, (flags & MUTT_MATCH_FULL_ADDRESS), 1, h->env->to));
     case MUTT_CC:
       if (!h->env)
         return 0;
       return (pat->not ^
-              match_addrlist(pat, flags & MUTT_MATCH_FULL_ADDRESS, 1, h->env->cc));
+              match_addrlist(pat, (flags & MUTT_MATCH_FULL_ADDRESS), 1, h->env->cc));
     case MUTT_SUBJECT:
       if (!h->env)
         return 0;
@@ -1924,13 +1924,13 @@ int mutt_pattern_exec(struct Pattern *pat, enum PatternExecFlag flags,
     case MUTT_ADDRESS:
       if (!h->env)
         return 0;
-      return (pat->not ^ match_addrlist(pat, flags & MUTT_MATCH_FULL_ADDRESS, 4,
+      return (pat->not ^ match_addrlist(pat, (flags & MUTT_MATCH_FULL_ADDRESS), 4,
                                         h->env->from, h->env->sender,
                                         h->env->to, h->env->cc));
     case MUTT_RECIPIENT:
       if (!h->env)
         return 0;
-      return (pat->not ^ match_addrlist(pat, flags & MUTT_MATCH_FULL_ADDRESS, 2,
+      return (pat->not ^ match_addrlist(pat, (flags & MUTT_MATCH_FULL_ADDRESS), 2,
                                         h->env->to, h->env->cc));
     case MUTT_LIST: /* known list, subscribed or not */
       if (!h->env)