X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Flog.c;h=402e82dbdf0472e18c78b2c08fffeb00accbbe3f;hb=e63bb0d39729941954175ae01ac67db8d0f1d990;hp=a791450da0a4bba518ca3a7969e05b786d9cf738;hpb=c31033a5fe1af1632a11c03de2290650ba8a82c6;p=tlsproxy%2Ftlsproxy.git diff --git a/src/log.c b/src/log.c index a791450..402e82d 100644 --- a/src/log.c +++ b/src/log.c @@ -33,9 +33,10 @@ void log_message(int level, const char *file, int line, const char *format, ...) } switch (level) { - case LOG_ERROR_LEVEL: level_string = "ERROR"; break; - case LOG_WARNING_LEVEL: level_string = "WARN "; break; - case LOG_DEBUG_LEVEL: level_string = "DEBUG"; break; + case LOG_ERROR_LEVEL: level_string = "ERROR "; break; + case LOG_WARNING_LEVEL: level_string = " WARN "; break; + case LOG_DEBUG1_LEVEL: level_string = "DEBUG1"; break; + case LOG_DEBUG2_LEVEL: level_string = "DEBUG2"; break; default: level_string = "UNKNOWN"; } @@ -45,18 +46,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:%-4d ", 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);