Sort #includes and remove unnecessary comments.

[tlsproxy/tlsproxy.git] / src / log.c

diff --git a/src/log.c b/src/log.c
index 23b90eecc57559350a066f22568dd2b93bf8326b..02cadd200d7bc6dd8f5460f19435d11af16c4d67 100644 (file)
--- a/src/log.c
+++ b/src/log.c
@@ -1,7 +1,7 @@
 /*
  * Log related functions/defines.
  *
- * Copyright (C) 2011  Simon Ruderich
+ * Copyright (C) 2011-2013  Simon Ruderich
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,10 +20,8 @@
 #include "tlsproxy.h"
 #include "log.h"
 
-/* va_*() */
-#include <stdarg.h>
-/* pthread_self() */
 #include <pthread.h>
+#include <stdarg.h>
 
 
 void log_message(int level, const char *file, int line, const char *format, ...) {
@@ -41,14 +39,22 @@ void log_message(int level, const char *file, int line, const char *format, ...)
         default:                level_string = "UNKNOWN";
     }
 
-    va_start(ap, format);
-#ifdef DEBUG
-    fprintf(stdout, "%-12s:%-3d ", file, line);
-#else
+#ifndef DEBUG
+    /* Prevent warnings. */
     (void)file;
     (void)line;
 #endif
-    fprintf(stdout, "[%s] [%d] ", level_string, (int)pthread_self());
+
+    va_start(ap, format);
+    fprintf(stdout,
+#ifdef DEBUG
+            "%-12s:%-3d "
+#endif
+            "[%s] [%d] ",
+#ifdef DEBUG
+            file, line,
+#endif
+            level_string, (int)pthread_self());
     vfprintf(stdout, format, ap);
     fprintf(stdout, "\n");
     va_end(ap);