Reflect recent changes in MU (mu_debug_handle_t/mu_debug_level_t types).

11 files changed, 14 insertions, 13 deletions

diff --git a/lib/db.c b/lib/db.c
index 813612ce..4360759d 100644
--- a/lib/db.c
+++ b/lib/db.c
@@ -37,7 +37,7 @@ struct db_fmt_list {
 };
 
 static struct db_fmt_list *db_fmt_list;
-static size_t debug_handle;
+static mu_debug_handle_t debug_handle;
 
 void
 db_format_enumerate(dbfmt_enumerator_t fp, void *data)
diff --git a/lib/dns.c b/lib/dns.c
index 70d1bbda..c4f30167 100644
--- a/lib/dns.c
+++ b/lib/dns.c
@@ -37,7 +37,7 @@ struct mx_buffer {
 	char *name;
 };
 
-static size_t debug_handle;
+static mu_debug_handle_t debug_handle;
 
 void
 dnsbase_init()
diff --git a/lib/mf-dbm.c b/lib/mf-dbm.c
index b275a155..4d2fc223 100644
--- a/lib/mf-dbm.c
+++ b/lib/mf-dbm.c
@@ -41,7 +41,7 @@
 
 size_t lock_retry_count_option = 3;
 time_t lock_retry_timeout_option = 1;
-static size_t debug_handle;
+static mu_debug_handle_t debug_handle;
 
 void
 libdbm_init()
diff --git a/lib/mfdb.h b/lib/mfdb.h
index 072ad24e..57d8ed7f 100644
--- a/lib/mfdb.h
+++ b/lib/mfdb.h
@@ -22,7 +22,7 @@ struct db_format {
 	char *name;
 	char *dbname;
 	int enabled;
-	size_t debug_handle;
+	mu_debug_handle_t debug_handle;
 	time_t expire_interval;
 	db_item_printer_t print_item;
 	db_expire_t expire;
@@ -30,7 +30,7 @@ struct db_format {
 
 typedef int (*dbfmt_enumerator_t)(struct db_format *fmt, void *);
 
-extern size_t db_debug_handle;
+extern mu_debug_handle_t db_debug_handle;
 extern struct db_format *cache_format;
 
 struct db_format *cache_format;
diff --git a/lib/srvman.c b/lib/srvman.c
index b5c24de1..5c3a8ff9 100644
--- a/lib/srvman.c
+++ b/lib/srvman.c
@@ -81,7 +81,7 @@ struct srvman {
 };
 
 static struct srvman srvman;
-static size_t debug_handle;
+static mu_debug_handle_t debug_handle;
 
 static sig_handler_t
 set_signal(int sig, sig_handler_t handler)
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"
 
 
diff --git a/src/main.c b/src/main.c
index 98440ff6..43df6519 100644
--- a/src/main.c
+++ b/src/main.c
@@ -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()