diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-11-23 18:28:08 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2016-11-23 18:28:08 +0200 |
commit | f2980e5a1a7495e31f75b979b258bd0fffdb310e (patch) | |
tree | 231c0f67aba8a7128a1d9c45d7674601bf16d6f3 /libmu_sieve/extensions/moderator.c | |
parent | 4e162e9bb1a48269ce57a739a07d8c933a17bd57 (diff) | |
download | mailutils-f2980e5a1a7495e31f75b979b258bd0fffdb310e.tar.gz mailutils-f2980e5a1a7495e31f75b979b258bd0fffdb310e.tar.bz2 |
Redo sieve debugging support
Instead of keeping individual debug flags for each Sieve machine,
use global debugging mechanism, category "sieve". The following
levels are defined:
trace1 - print parse tree before optimization
trace2 - print parse tree after optimization
trace3 - print parser traces
trace4 - print tests and actions being executed
trace8 - print disassembled code, don't run
trace9 - print each Sieve instruction being executed
* include/mailutils/sieve.h (mu_sieve_get_debug_level)
(mu_sieve_set_debug_level): Remove.
(mu_sieve_is_dry_run,mu_sieve_set_dry_run
* lib/script.c (mu_script_debug_flags): Redo.
* lib/sieve.c (sieve_init): Remove call to obsoleted
mu_sieve_set_debug_level.
* examples/numaddr.c: Use mu_sieve_trace
* libmu_sieve/extensions/list.c: Likewise.
* libmu_sieve/extensions/moderator.c: Likewise.
* libmu_sieve/extensions/pipe.c: Likewise.
* libmu_sieve/extensions/spamd.c: Likewise.
* libmu_sieve/extensions/timestamp.c: Likewise.
* libmu_sieve/extensions/vacation.c: Likewise.
* libmu_sieve/tests.c: Likewise.
* libmu_sieve/runtime.c (INSTR_DEBUG,INSTR_DISASS): Rewrite.
(mu_sieve_get_debug_level): Remove.
(mu_sieve_is_dry_run_: Rewrite.
(mu_sieve_set_dry_run): New function.
(mu_sieve_disass): Rewrite.
* libmu_sieve/sieve-priv.h (mu_sieve_machine) <debug_level>: Remove.
<dry_run>: New field.
* libmu_sieve/sieve.y (mu_sieve_set_debug_level): Remove.
* libmu_sieve/util.c (mu_sieve_trace): New function.
* sieve/sieve.c: Rewrite support for --dry-run and --debug.
* sieve/tests/ext.at: Use --libdir-prefix instead of -L
Diffstat (limited to 'libmu_sieve/extensions/moderator.c')
-rw-r--r-- | libmu_sieve/extensions/moderator.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmu_sieve/extensions/moderator.c b/libmu_sieve/extensions/moderator.c index d88972529..00b1de494 100644 --- a/libmu_sieve/extensions/moderator.c +++ b/libmu_sieve/extensions/moderator.c @@ -273,11 +273,8 @@ moderator_action (mu_sieve_machine_t mach, mu_list_t args, mu_list_t tags) int discard = 0; int ismime; - if (mu_sieve_get_debug_level (mach) & MU_SIEVE_DEBUG_TRACE) - { - mu_sieve_debug (mach, "moderator_test %lu", - (unsigned long) mu_sieve_get_message_num (mach)); - } + mu_sieve_trace (mach, "moderator_test %lu", + (unsigned long) mu_sieve_get_message_num (mach)); msg = mu_sieve_get_message (mach); mu_message_is_multipart (msg, &ismime); |