]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
global: Never use t_push(NULL)
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Wed, 31 Mar 2021 10:13:22 +0000 (13:13 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Tue, 4 May 2021 07:02:35 +0000 (07:02 +0000)
A non-NULL name is expected by the debug logging.

src/lib-master/master-service.c
src/lib/data-stack.c

index d264be5a2d0c78776e8b963e1a467da11d502cec..b1f01e2de2c5954899a2a0e76111bdff98bdbf70 100644 (file)
@@ -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();
index 807d06ffc949e7b20d61b3cb1c10a0fd1e49dd48..2cb3c8f8db2a6e5db558f14d14065f7b40c82673 100644 (file)
@@ -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);