X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flog.c;h=e3af295e4c42cbabadb8e023f6d99bfabe94e7d8;hb=7eba49d24d56288d83746f3f0ce383d7c0c36552;hp=b3c2083b7f822ab2cdb896f7552f144cd2439806;hpb=d87efa4a7a6285603950f5780ef57a72b651c8e9;p=tlsproxy%2Ftlsproxy.git diff --git a/src/log.c b/src/log.c index b3c2083..e3af295 100644 --- a/src/log.c +++ b/src/log.c @@ -1,7 +1,7 @@ /* * Log related functions/defines. * - * Copyright (C) 2011-2013 Simon Ruderich + * Copyright (C) 2011-2014 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 @@ -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_DEBUG1_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"; } @@ -49,9 +50,9 @@ void log_message(int level, const char *file, int line, const char *format, ...) flockfile(stderr); #ifdef DEBUG - fprintf(stderr, "%-12s:%-3d ", file, line); + fprintf(stderr, "%-12s:%-4d ", file, line); #endif - fprintf(stderr, "[%s] [%d] ", level_string, (int)pthread_self()); + fprintf(stderr, "[%s] [%ld] ", level_string, (long)pthread_self()); va_start(ap, format); vfprintf(stderr, format, ap); va_end(ap);