X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pattern.c;h=e07377f0cbd1734aba466c30769d62cf24508936;hp=8ace17a6b225e1e96bfd2bd635cea41756c14613;hb=ac813896ca32d850febc2d95065ac4fa040f11f9;hpb=108f3c7ab59844591f7540347914ea57be5245e2 diff --git a/pattern.c b/pattern.c index 8ace17a..e07377f 100644 --- a/pattern.c +++ b/pattern.c @@ -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];