From d94b9c8124225afd37deae32bf403c19ade1d109 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 11 Nov 2022 22:25:34 +0100 Subject: [PATCH] tevent: make use of TEVENT_DEBUG() when using TEVENT_DEBUG_TRACE Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme --- lib/tevent/tevent_epoll.c | 2 +- lib/tevent/tevent_immediate.c | 6 +++--- lib/tevent/tevent_threads.c | 2 +- lib/tevent/tevent_timed.c | 8 ++++---- lib/tevent/tevent_wrapper.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/tevent/tevent_epoll.c b/lib/tevent/tevent_epoll.c index ac8340118e9..f77f50995e2 100644 --- 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 eb607c49ab9..82f92f1bd78 100644 --- 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 5ba6029fee1..2dc1f17bc9e 100644 --- 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 67e39ed0dd7..b4a24980c60 100644 --- 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 a0e915f6753..4f35dfda24f 100644 --- 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));