X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flogfile.c;h=6d0f6e07826f2eb5391a64bc93db72e642948362;hb=02e12dba7080e60badf853c92aa83c6fd99ba4f0;hp=71ddec68e764fd51c0dbeb3d5c16e6985cc2e2f6;hpb=ffa4409610e34e6f0945f365de44b986688b2353;p=collectd.git

diff --git a/src/logfile.c b/src/logfile.c
index 71ddec68..6d0f6e07 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -39,14 +39,14 @@ static pthread_mutex_t file_lock = PTHREAD_MUTEX_INITIALIZER;
 
 static char *log_file = NULL;
 static int print_timestamp = 1;
-static int print_level = 0;
+static int print_severity = 0;
 
 static const char *config_keys[] =
 {
 	"LogLevel",
 	"File",
 	"Timestamp",
-	"PrintLevel"
+	"PrintSeverity"
 };
 static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
 
@@ -80,11 +80,11 @@ static int logfile_config (const char *key, const char *value)
 			print_timestamp = 0;
 		else
 			print_timestamp = 1;
-	} else if (0 == strcasecmp(key, "PrintLevel")) {
+	} else if (0 == strcasecmp(key, "PrintSeverity")) {
 		if (IS_FALSE (value))
-			print_level = 0;
+			print_severity = 0;
 		else
-			print_level = 1;
+			print_severity = 1;
 	}
 	else {
 		return -1;
@@ -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)
+	if (print_severity)
 	{
 		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);