X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Flogfile.c;h=6d555842f787dda0c687c0a08d2cf4657cd6aba3;hb=0a8741b9061f8df4a78a448c021612db06e17425;hp=b75ecb8b39878843b5ca4abf21d89db38e2fa155;hpb=ca4a6c8a856a9012270ec10389b08d54e70e3401;p=collectd.git

diff --git a/src/logfile.c b/src/logfile.c
index b75ecb8b..6d555842 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -27,11 +27,10 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
-
 #define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
 
 #if COLLECT_DEBUG
@@ -91,7 +90,6 @@ static void logfile_print (const char *msg, int severity,
 {
 	FILE *fh;
 	_Bool do_close = 0;
-	struct tm timestamp_tm;
 	char timestamp_str[64];
 	char level_str[16] = "";
 
@@ -121,8 +119,8 @@ static void logfile_print (const char *msg, int severity,
 
 	if (print_timestamp)
 	{
-		time_t tt = CDTIME_T_TO_TIME_T (timestamp_time);
-		localtime_r (&tt, &timestamp_tm);
+		struct tm timestamp_tm;
+		localtime_r (&CDTIME_T_TO_TIME_T (timestamp_time), &timestamp_tm);
 
 		strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S",
 				&timestamp_tm);
@@ -201,7 +199,7 @@ static int logfile_notification (const notification_t *n,
 
 #define APPEND(bufptr, buflen, key, value) \
 	if ((buflen > 0) && (strlen (value) > 0)) { \
-		int status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \
+		status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \
 		if (status > 0) { \
 			bufptr += status; \
 			buflen -= status; \