tevent: make use of TEVENT_DEBUG() when using TEVENT_DEBUG_TRACE

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c
index ac8340118e967da5db01ecc8c96262f202600ab3..f77f50995e2fbc6fe500ebae1c962a792205bffb 100644 (file)
--- a/lib/tevent/tevent_epoll.c
+++ b/lib/tevent/tevent_epoll.c
@@ -448,7 +448,7 @@ static void epoll_del_event(struct epoll_event_context *epoll_ev, struct tevent_
                 * This can happen after a epoll_check_reopen
                 * within epoll_event_fd_destructor.
                 */
-               tevent_debug(epoll_ev->ev, TEVENT_DEBUG_TRACE,
+               TEVENT_DEBUG(epoll_ev->ev, TEVENT_DEBUG_TRACE,
                             "EPOLL_CTL_DEL ignoring ENOENT for fd[%d]\n",
                             fde->fd);
                return;

diff --git a/lib/tevent/tevent_immediate.c b/lib/tevent/tevent_immediate.c
index eb607c49ab9bb638ba8b9a19aa78485f425b6a7e..82f92f1bd7862a6d046380ccd497d34eebd4e9ff 100644 (file)
--- a/lib/tevent/tevent_immediate.c
+++ b/lib/tevent/tevent_immediate.c
@@ -55,7 +55,7 @@ static void tevent_common_immediate_cancel(struct tevent_immediate *im)
        }
 
        if (im->handler_name != NULL) {
-               tevent_debug(im->event_ctx, TEVENT_DEBUG_TRACE,
+               TEVENT_DEBUG(im->event_ctx, TEVENT_DEBUG_TRACE,
                             "Cancel immediate event %p \"%s\"\n",
                             im, im->handler_name);
        }
@@ -146,7 +146,7 @@ void tevent_common_schedule_immediate(struct tevent_immediate *im,
        DLIST_ADD_END(ev->immediate_events, im);
        talloc_set_destructor(im, tevent_common_immediate_destructor);
 
-       tevent_debug(ev, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(ev, TEVENT_DEBUG_TRACE,
                     "Schedule immediate event \"%s\": %p\n",
                     handler_name, im);
 }
@@ -162,7 +162,7 @@ int tevent_common_invoke_immediate_handler(struct tevent_immediate *im,
                *removed = false;
        }
 
-       tevent_debug(ev, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(ev, TEVENT_DEBUG_TRACE,
                     "Run immediate event \"%s\": %p\n",
                     im->handler_name, im);
 

diff --git a/lib/tevent/tevent_threads.c b/lib/tevent/tevent_threads.c
index 5ba6029fee183ec9245684279bd9f490865d44e6..2dc1f17bc9e895b527f4ecdbba1c88e8241b483a 100644 (file)
--- a/lib/tevent/tevent_threads.c
+++ b/lib/tevent/tevent_threads.c
@@ -576,7 +576,7 @@ void tevent_common_threaded_activate_immediate(struct tevent_context *ev)
 
                DLIST_REMOVE(ev->scheduled_immediates, im);
 
-               tevent_debug(ev, TEVENT_DEBUG_TRACE,
+               TEVENT_DEBUG(ev, TEVENT_DEBUG_TRACE,
                             "Schedule immediate event \"%s\": %p from thread into main\n",
                             im->handler_name, im);
                im->handler_name = NULL;

diff --git a/lib/tevent/tevent_timed.c b/lib/tevent/tevent_timed.c
index 67e39ed0dd7424c7160f6a052afaee2f3499a08d..b4a24980c60ce013ca4d930cca653f02009f9379 100644 (file)
--- a/lib/tevent/tevent_timed.c
+++ b/lib/tevent/tevent_timed.c
@@ -144,7 +144,7 @@ static int tevent_common_timed_destructor(struct tevent_timer *te)
                return 0;
        }
 
-       tevent_debug(te->event_ctx, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(te->event_ctx, TEVENT_DEBUG_TRACE,
                     "Destroying timer event %p \"%s\"\n",
                     te, te->handler_name);
 
@@ -259,7 +259,7 @@ static struct tevent_timer *tevent_common_add_timer_internal(
        talloc_set_destructor(te, tevent_common_timed_destructor);
 
 
-       tevent_debug(ev, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(ev, TEVENT_DEBUG_TRACE,
                     "Added timed event \"%s\": %p\n",
                     handler_name, te);
        return te;
@@ -346,7 +346,7 @@ int tevent_common_invoke_timer_handler(struct tevent_timer *te,
        }
        DLIST_REMOVE(te->event_ctx->timer_events, te);
 
-       tevent_debug(te->event_ctx, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(te->event_ctx, TEVENT_DEBUG_TRACE,
                     "Running timer event %p \"%s\"\n",
                     te, te->handler_name);
 
@@ -388,7 +388,7 @@ int tevent_common_invoke_timer_handler(struct tevent_timer *te,
        }
        te->busy = false;
 
-       tevent_debug(te->event_ctx, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(te->event_ctx, TEVENT_DEBUG_TRACE,
                     "Ending timer event %p \"%s\"\n",
                     te, te->handler_name);
 

diff --git a/lib/tevent/tevent_wrapper.c b/lib/tevent/tevent_wrapper.c
index a0e915f67532ecd67f2ee26b2fc6c0e8d3963668..4f35dfda24f3c45a9e7a3363001b68e674425cdf 100644 (file)
--- a/lib/tevent/tevent_wrapper.c
+++ b/lib/tevent/tevent_wrapper.c
@@ -227,7 +227,7 @@ static int tevent_wrapper_context_destructor(struct tevent_context *wrap_ev)
                return 0;
        }
 
-       tevent_debug(wrap_ev, TEVENT_DEBUG_TRACE,
+       TEVENT_DEBUG(wrap_ev, TEVENT_DEBUG_TRACE,
                     "Destroying wrapper context %p \"%s\"\n",
                     wrap_ev, talloc_get_name(glue->private_state));