log.c: Simplify #ifdef DEBUG in log_message().

As we use flockfile() multiple fprintf() don't create a race-condition.

This also prevents a warning with clang which uses a macro for
fprintf(). #ifdefs within macro arguments is not portable.

diff --git a/src/log.c b/src/log.c
index 4dc53f78124b08c621abd33f8123b31fa7e77309..b3c2083b7f822ab2cdb896f7552f144cd2439806 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -45,18 +45,13 @@ void log_message(int level, const char *file, int line, const char *format, ...)
     (void)line;
 #endif
 
-    /* Prevent another thread from interrupting the two printfs(). */
+    /* Prevent another thread from interrupting the printfs(). */
     flockfile(stderr);
 
-    fprintf(stderr,
 #ifdef DEBUG
-            "%-12s:%-3d "
+    fprintf(stderr, "%-12s:%-3d ", file, line);
 #endif
-            "[%s] [%d] ",
-#ifdef DEBUG
-            file, line,
-#endif
-            level_string, (int)pthread_self());
+    fprintf(stderr, "[%s] [%d] ", level_string, (int)pthread_self());
     va_start(ap, format);
     vfprintf(stderr, format, ap);
     va_end(ap);