X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Flib%2Fslog.c;h=d6c4bc2e305cef23e1833857e4f1abc709568e15;hp=99eb536d1954a9996163bd112ded7089ef9bb1d8;hb=bd7036af56a4b61b2b473dccbeac5e26f78b57da;hpb=e248180cc4ebc258fdd5778a26c08287089165b1

diff --git a/src/lib/slog.c b/src/lib/slog.c
index 99eb536..d6c4bc2 100644
--- a/src/lib/slog.c
+++ b/src/lib/slog.c
@@ -34,6 +34,7 @@
 #include "bool.h"
 #include "config.h"
 #include <plog.h>
+#include <pmutex.h>
 #include "ptime.h"
 #include "slog.h"
 
@@ -57,15 +58,14 @@ static char *time_to_str(time_t *t)
 
 	str = malloc(64);
 
-	if (strftime(str, 64, "%s", &lt)) {
+	if (strftime(str, 64, "%s", &lt))
 		return str;
-	} else {
-		free(str);
-		return NULL;
-	}
+
+	free(str);
+	return NULL;
 }
 
-static char *get_default_path()
+static char *get_default_path(void)
 {
 	char *home, *path, *dir;
 
@@ -82,10 +82,10 @@ static char *get_default_path()
 		free(dir);
 
 		return path;
-	} else {
-		log_warn(_("HOME variable not set."));
-		return strdup(DEFAULT_FILENAME);
 	}
+
+	log_warn(_("HOME variable not set."));
+	return strdup(DEFAULT_FILENAME);
 }
 
 static bool slog_open(const char *path, struct psensor **sensors)
@@ -133,8 +133,8 @@ static void slog_write_sensors(struct psensor **sensors)
 	bool first_call;
 
 	if (!file) {
-		log_err(_("Sensor log file not open."));
-		return ;
+		log_debug(_("Sensor log file not open."));
+		return;
 	}
 
 	gettimeofday(&tv, NULL);
@@ -169,17 +169,17 @@ static void *slog_routine(void *data)
 {
 	while (1) {
 		pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, NULL);
-		pthread_mutex_lock(sensors_mutex);
+		pmutex_lock(sensors_mutex);
 		slog_write_sensors(sensors);
-		pthread_mutex_unlock(sensors_mutex);
+		pmutex_unlock(sensors_mutex);
 		pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
 		sleep(period);
 	}
 
-	pthread_exit(0);
+	pthread_exit(NULL);
 }
 
-void slog_close()
+void slog_close(void)
 {
 	if (file) {
 		pthread_cancel(thread);