Make printf of gstring null-safe

[user/henk/code/exim.git] / src / src / log.c

diff --git a/src/src/log.c b/src/src/log.c
index 08ece6158eb41e02f087f65d01c3f3778ea3fbc5..fac577d5a6ba57a13839d67e4a280a6088585f10 100644 (file)
--- a/src/src/log.c
+++ b/src/src/log.c
@@ -958,8 +958,7 @@ DEBUG(D_any|D_v)
     }
   va_end(ap);
 
-  g = string_catn(g, US"\n", 1);
-  debug_printf("%s", string_from_gstring(g));
+  debug_printf("%Y\n", g);
 
   gs.size = LOG_BUFFER_SIZE-2; /* Having used the buffer for debug output, */
   gs.ptr = 0;                  /* reset it for the real use. */
@@ -996,7 +995,7 @@ if (LOGGING(pid))
   if (!syslog_pid) pid_position[1] = g->ptr;           /*  … and end+1 of the PID */
   }
 
-if (f.really_exim && message_id[0] != 0)
+if (f.really_exim && message_id[0])
   g = string_fmt_append(g, "%s ", message_id);
 
 if (flags & LOG_CONFIG)