git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow both -bf and -bF in the same test run.
[exim.git]
/
src
/
src
/
sieve.c
diff --git
a/src/src/sieve.c
b/src/src/sieve.c
index 4301d1ab7d6520e6dab7b6b085af619c3bd2b37e..c684e34a9de4f086e9ae7177b156368d618a9c85 100644
(file)
--- a/
src/src/sieve.c
+++ b/
src/src/sieve.c
@@
-1,4
+1,4
@@
-/* $Cambridge: exim/src/src/sieve.c,v 1.
1 2004/10/07 10:39:0
1 ph10 Exp $ */
+/* $Cambridge: exim/src/src/sieve.c,v 1.
2 2004/11/25 13:54:3
1 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
/*************************************************
* Exim - an Internet mail transport agent *
@@
-631,7
+631,7
@@
static int compare(struct Sieve *filter, const struct String *needle, const stru
{
int r=0;
{
int r=0;
-if ((filter_test !=
NULL
&& debug_selector != 0) ||
+if ((filter_test !=
FTEST_NONE
&& debug_selector != 0) ||
(debug_selector & D_filter) != 0)
{
debug_printf("String comparison (match ");
(debug_selector & D_filter) != 0)
{
debug_printf("String comparison (match ");
@@
-728,7
+728,7
@@
switch (mt)
break;
}
}
break;
}
}
-if ((filter_test !=
NULL
&& debug_selector != 0) ||
+if ((filter_test !=
FTEST_NONE
&& debug_selector != 0) ||
(debug_selector & D_filter) != 0)
debug_printf(" Result %s\n",r?"true":"false");
return r;
(debug_selector & D_filter) != 0)
debug_printf(" Result %s\n",r?"true":"false");
return r;
@@
-852,7
+852,7
@@
for (new_addr=*generated; new_addr; new_addr=new_addr->next)
{
if (Ustrcmp(new_addr->address,addr)==0 && (file ? testflag(new_addr, af_pfr|af_file) : 1))
{
{
if (Ustrcmp(new_addr->address,addr)==0 && (file ? testflag(new_addr, af_pfr|af_file) : 1))
{
- if ((filter_test !=
NULL
&& debug_selector != 0) || (debug_selector & D_filter) != 0)
+ if ((filter_test !=
FTEST_NONE
&& debug_selector != 0) || (debug_selector & D_filter) != 0)
{
debug_printf("Repeated %s `%s' ignored.\n",file ? "fileinto" : "redirect", addr);
}
{
debug_printf("Repeated %s `%s' ignored.\n",file ? "fileinto" : "redirect", addr);
}
@@
-860,7
+860,7
@@
for (new_addr=*generated; new_addr; new_addr=new_addr->next)
}
}
}
}
-if ((filter_test !=
NULL
&& debug_selector != 0) || (debug_selector & D_filter) != 0)
+if ((filter_test !=
FTEST_NONE
&& debug_selector != 0) || (debug_selector & D_filter) != 0)
{
debug_printf("%s `%s'\n",file ? "fileinto" : "redirect", addr);
}
{
debug_printf("%s `%s'\n",file ? "fileinto" : "redirect", addr);
}
@@
-2771,7
+2771,7
@@
else
}
#ifndef COMPILE_SYNTAX_CHECKER
}
#ifndef COMPILE_SYNTAX_CHECKER
-if (filter_test !=
NULL
) printf("%s\n", (const char*) msg);
+if (filter_test !=
FTEST_NONE
) printf("%s\n", (const char*) msg);
else debug_printf("%s\n", msg);
#endif
else debug_printf("%s\n", msg);
#endif