From: Timo Sirainen Date: Wed, 31 Mar 2021 10:13:22 +0000 (+0300) Subject: global: Never use t_push(NULL) X-Git-Tag: 2.3.16~261 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dda74fe776af7eff458b704316f5fbc9e04dc680;p=thirdparty%2Fdovecot%2Fcore.git global: Never use t_push(NULL) A non-NULL name is expected by the debug logging. --- diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c index d264be5a2d..b1f01e2de2 100644 --- a/src/lib-master/master-service.c +++ b/src/lib-master/master-service.c @@ -251,7 +251,7 @@ master_service_init(const char *name, enum master_service_flags flags, before we get to ioloop. the corresponding t_pop() is in master_service_init_finish(). */ if ((flags & MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME) == 0) - datastack_frame_id = t_push(NULL); + datastack_frame_id = t_push("master_service_init"); /* ignore these signals as early as possible */ lib_signals_init(); diff --git a/src/lib/data-stack.c b/src/lib/data-stack.c index 807d06ffc9..2cb3c8f8db 100644 --- a/src/lib/data-stack.c +++ b/src/lib/data-stack.c @@ -134,6 +134,8 @@ data_stack_frame_t t_push(const char *marker) { struct stack_frame_block *frame_block; + i_assert(marker != NULL); + frame_pos++; if (frame_pos == BLOCK_FRAME_COUNT) { /* frame block full */ @@ -184,7 +186,7 @@ data_stack_frame_t t_push(const char *marker) data_stack_frame_t t_push_named(const char *format, ...) { - data_stack_frame_t ret = t_push(NULL); + data_stack_frame_t ret = t_push(format); #ifdef DEBUG va_list args; va_start(args, format);