Moody patch fixing compilation warnings

[apps/madmutt.git] / pattern.c

diff --git a/pattern.c b/pattern.c
index 35cdbd9..e07377f 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -21,9 +21,10 @@
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/enter.h>
+
 #include "mutt.h"
 #include "handler.h"
-#include "enter.h"
 #include "mx.h"
 #include "keymap.h"
 #include "copy.h"
@@ -891,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)
@@ -1109,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->
@@ -1146,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];