X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=e07377f0cbd1734aba466c30769d62cf24508936;hp=95157b1e56715962ab06efeaf21e7c75723256e3;hb=ac813896ca32d850febc2d95065ac4fa040f11f9;hpb=ecfcc6df70230ba136c2fb3843700ecb749c41b7

diff --git a/pattern.c b/pattern.c
index 95157b1..e07377f 100644
--- a/pattern.c
+++ b/pattern.c
@@ -892,7 +892,7 @@ static int match_adrlist (pattern_t* pat, int match_personal, int alladdr __attr
   return pat->alladdr;               /* No matches, or all matches if alladdr */
 }
 
-static int match_reference (pattern_t* pat, LIST * refs)
+static int match_reference (pattern_t* pat, string_list_t * refs)
 {
   for (; refs; refs = refs->next)
     if (patmatch (pat, refs->data) == 0)
@@ -1110,17 +1110,13 @@ mutt_pattern_exec (struct pattern_t *pat, pattern_exec_flag flags,
      * - or we have an alias for current address
      * - or From: contains valid email address _and_ name has >= 2 fields
      */
-    return (pat->
-            not ^ (h->env && h->env->from && (mutt_addr_is_user (h->env->from)
-                                              ||
-                                              (alias_reverse_lookup
-                                               (h->env->from) != NULL)
-                                              || (h->env->from->personal
-                                                  && valid_realname (h->env->
-                                                                     from->
-                                                                     personal)
-                                                  && h->env->from->mailbox)
-                   )));
+    return (h->env && h->env->from
+        && (mutt_addr_is_user(h->env->from)
+            || alias_reverse_lookup(h->env->from)
+            || (h->env->from->personal
+                && valid_realname(h->env-> from->personal)
+                && h->env->from->mailbox)
+           )) ^ pat->not;
 #ifdef USE_NNTP
   case M_NEWSGROUPS:
     return (pat->
@@ -1147,7 +1143,7 @@ static void quote_simple (char *tmp, ssize_t len, const char *p)
 }
 
 /* convert a simple search into a real request */
-void mutt_check_simple (char *s, size_t len, const char *simple)
+void mutt_check_simple (char *s, ssize_t len, const char *simple)
 {
   char tmp[LONG_STRING];