From cbc244bc1f4493784282ba6c5f8efc33158f18f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Sun, 14 Mar 2010 09:25:42 +0100 Subject: [PATCH] Impove level print --- src/logfile.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/logfile.c b/src/logfile.c index 71ddec68..6da13df2 100644 --- a/src/logfile.c +++ b/src/logfile.c @@ -98,26 +98,26 @@ static void logfile_print (const char *msg, int severity, time_t timestamp_time) int do_close = 0; struct tm timestamp_tm; char timestamp_str[64]; - char level_str[16]; + char level_str[16] = ""; if (print_level) { switch (severity) { case LOG_ERR: - snprintf(level_str, 15, "[error] "); + snprintf(level_str, sizeof (level_str), "[error] "); break; case LOG_WARNING: - snprintf(level_str, 15, "[warning] "); + snprintf(level_str, sizeof (level_str), "[warning] "); break; case LOG_NOTICE: - snprintf(level_str, 15, "[notice] "); + snprintf(level_str, sizeof (level_str), "[notice] "); break; case LOG_INFO: - snprintf(level_str, 15, "[info] "); + snprintf(level_str, sizeof (level_str), "[info] "); break; case LOG_DEBUG: - snprintf(level_str, 15, "[debug] "); + snprintf(level_str, sizeof (level_str), "[debug] "); break; default: break; @@ -160,12 +160,9 @@ static void logfile_print (const char *msg, int severity, time_t timestamp_time) else { if (print_timestamp) - fprintf (fh, "[%s] %s%s\n", timestamp_str, - print_level ? level_str : "", - msg); + fprintf (fh, "[%s] %s%s\n", timestamp_str, level_str, msg); else - fprintf (fh, "%s%s\n", print_level ? level_str : "", - msg); + fprintf (fh, "%s%s\n", level_str, msg); if (do_close != 0) fclose (fh); -- 2.11.0