X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=e00a08d8aa77f9a2914ce39fee3821c97bd87e97;hb=c98db32cbc4a3f7e4b655aacfbc503639bb8379c;hp=a703c1cc536b283d143227adb2bdae071374ded7;hpb=64bfebde76d568808b6fa8a8d09b4b5afe13dc15;p=tlsproxy%2Ftlsproxy.git diff --git a/src/log.c b/src/log.c index a703c1c..e00a08d 100644 --- 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 @@ -22,7 +22,7 @@ /* va_*() */ #include -/* pthread_*() */ +/* pthread_self() */ #include @@ -41,14 +41,22 @@ void log_message(int level, const char *file, int line, const char *format, ...) default: level_string = "UNKNOWN"; } - va_start(ap, format); -#if 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);