diff options
| author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-12-23 01:01:10 +0200 |
|---|---|---|
| committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-12-23 01:01:10 +0200 |
| commit | 1e22a15d689a0578ae3ea724bed0d219441e3f55 (patch) | |
| tree | fe88b337b6de69449424796a7f7f84606d40df62 /src | |
| parent | 095ddfff517a1779436e239923a5bf57b09a2569 (diff) | |
| download | mailfromd-1e22a15d689a0578ae3ea724bed0d219441e3f55.tar.gz mailfromd-1e22a15d689a0578ae3ea724bed0d219441e3f55.tar.bz2 | |
Reflect recent changes in MU (mu_debug_handle_t/mu_debug_level_t types).
Diffstat (limited to 'src')
| -rw-r--r-- | src/builtin/other.bi | 2 | ||||
| -rw-r--r-- | src/builtin/snarf.m4 | 2 | ||||
| -rw-r--r-- | src/callout.c | 2 | ||||
| -rw-r--r-- | src/callout.h | 2 | ||||
| -rw-r--r-- | src/mailfromd.h | 2 | ||||
| -rw-r--r-- | src/main.c | 5 |
6 files changed, 8 insertions, 7 deletions
diff --git a/src/builtin/other.bi b/src/builtin/other.bi index b118f02c..174032f9 100644 --- a/src/builtin/other.bi +++ b/src/builtin/other.bi @@ -69,7 +69,7 @@ END MF_DEFUN(debug_level, NUMBER, OPTIONAL, STRING modname) { - int level; + mu_debug_level_t level; char *name = MF_OPTVAL(modname, NULL); size_t len = name ? 0 : strlen (name); diff --git a/src/builtin/snarf.m4 b/src/builtin/snarf.m4 index f9173df8..6888676e 100644 --- a/src/builtin/snarf.m4 +++ b/src/builtin/snarf.m4 @@ -607,7 +607,7 @@ m4_define([<MF_DEBUG>],[< m4_ifdef([<__MF_DEBUG>],,[<m4_dnl m4_define([<__MF_DEBUG>],1)m4_dnl m4_divert(3)m4_dnl -static size_t debug_handle; +static mu_debug_handle_t debug_handle; m4_divert(2)>]) [<mu_debug>](debug_handle, $@)>])>]) diff --git a/src/callout.c b/src/callout.c index cbbc1d90..c158a26d 100644 --- a/src/callout.c +++ b/src/callout.c @@ -703,7 +703,7 @@ static char *modnames[] = { NULL }; -size_t callout_debug_handle; +mu_debug_handle_t callout_debug_handle; void libcallout_init() diff --git a/src/callout.h b/src/callout.h index 2bff293b..2e408c1d 100644 --- a/src/callout.h +++ b/src/callout.h @@ -26,7 +26,7 @@ extern char *ehlo_domain; extern char *mailfrom_address; extern int enable_vrfy; -extern size_t callout_debug_handle; +extern mu_debug_handle_t callout_debug_handle; const char *mf_status_str(mf_status s); diff --git a/src/mailfromd.h b/src/mailfromd.h index 992bf9b3..ab2db737 100644 --- a/src/mailfromd.h +++ b/src/mailfromd.h @@ -103,7 +103,7 @@ mf_status getmxip(char *host, GACOPYZ_UINT32_T *ipbuf, size_t ipmax, /* Debugging macros */ -extern size_t mfd_debug_handle; +extern mu_debug_handle_t mfd_debug_handle; #include "mfd-dbgmod.h" @@ -125,7 +125,8 @@ trace(const char *fmt, ...) void log_status(sfsistat status, SMFICTX *ctx) { - int lev; + mu_debug_level_t lev; + mu_debug_category_level(NULL, 0, &lev); if ((lev & ~MU_DEBUG_LEVEL_MASK(MU_DEBUG_ERROR)) && status != SMFIS_CONTINUE) { @@ -1049,7 +1050,7 @@ static char *modnames[] = { NULL }; -size_t mfd_debug_handle; +mu_debug_handle_t mfd_debug_handle; static void debug_init() |