X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Flogfile.c;h=6d555842f787dda0c687c0a08d2cf4657cd6aba3;hb=fa82af13503a1195e1bfaef597ac33a3dc71a758;hp=63448cb6c4e9f61cc611c71ed2c37840d160e17e;hpb=70160d8f57c9a767ae2ca14e31c8687ecbb10db3;p=collectd.git

diff --git a/src/logfile.c b/src/logfile.c
index 63448cb6..6d555842 100644
--- a/src/logfile.c
+++ b/src/logfile.c
@@ -1,32 +1,36 @@
 /**
  * collectd - src/logfile.c
- * Copyright (C) 2007  Sebastian Harl
+ * Copyright (C) 2007       Sebastian Harl
  * Copyright (C) 2007,2008  Florian Forster
  *
- * 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 the
- * Free Software Foundation; only version 2 of the License is applicable.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * Authors:
  *   Sebastian Harl <sh at tokkee.org>
- *   Florian Forster <octo at verplant.org>
+ *   Florian Forster <octo at collectd.org>
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
-#include <pthread.h>
-
 #define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log"
 
 #if COLLECT_DEBUG
@@ -86,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] = "";
 
@@ -116,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);
@@ -196,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; \