X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fthermal.c;h=54311a647cc786aa40c27e85b4b1a514e0dbad11;hb=db35efb33e81d0a013e09a8a6ffa362ad5962f7c;hp=603f85bbf6a96595ee04891127f37006d90730aa;hpb=5efcb2fe5ca723225e4100314a8668d8abc9424a;p=collectd.git

diff --git a/src/thermal.c b/src/thermal.c
index 603f85bb..54311a64 100644
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -35,8 +35,8 @@ static const char *config_keys[] = {
 	"ForceUseProcfs"
 };
 
-const char *const dirname_sysfs = "/sys/class/thermal";
-const char *const dirname_procfs = "/proc/acpi/thermal_zone";
+static const char *const dirname_sysfs = "/sys/class/thermal";
+static const char *const dirname_procfs = "/proc/acpi/thermal_zone";
 
 static _Bool force_procfs = 0;
 static ignorelist_t *device_list;
@@ -80,12 +80,12 @@ static int thermal_sysfs_device_read (const char __attribute__((unused)) *dir,
 	if (device_list && ignorelist_match (device_list, name))
 		return -1;
 
-	len = snprintf (filename, sizeof (filename),
+	len = ssnprintf (filename, sizeof (filename),
 			"%s/%s/temp", dirname_sysfs, name);
 	if ((len < 0) || ((size_t) len >= sizeof (filename)))
 		return -1;
 
-	len = read_file_contents (filename, data, sizeof(data));
+	len = (ssize_t) read_file_contents (filename, data, sizeof(data));
 	if (len > 1 && data[--len] == '\n') {
 		char *endptr = NULL;
 		double temp;
@@ -100,12 +100,12 @@ static int thermal_sysfs_device_read (const char __attribute__((unused)) *dir,
 		}
 	}
 
-	len = snprintf (filename, sizeof (filename),
+	len = ssnprintf (filename, sizeof (filename),
 			"%s/%s/cur_state", dirname_sysfs, name);
 	if ((len < 0) || ((size_t) len >= sizeof (filename)))
 		return -1;
 
-	len = read_file_contents (filename, data, sizeof(data));
+	len = (ssize_t) read_file_contents (filename, data, sizeof(data));
 	if (len > 1 && data[--len] == '\n') {
 		char *endptr = NULL;
 		double state;
@@ -139,12 +139,12 @@ static int thermal_procfs_device_read (const char __attribute__((unused)) *dir,
 	 * temperature:             55 C
 	 */
 	
-	len = snprintf (filename, sizeof (filename),
+	len = ssnprintf (filename, sizeof (filename),
 			"%s/%s/temperature", dirname_procfs, name);
 	if ((len < 0) || ((size_t) len >= sizeof (filename)))
 		return -1;
 
-	len = read_file_contents (filename, data, sizeof(data));
+	len = (ssize_t) read_file_contents (filename, data, sizeof(data));
 	if ((len > 0) && ((size_t) len > sizeof(str_temp))
 			&& (data[--len] == '\n')
 			&& (! strncmp(data, str_temp, sizeof(str_temp)-1))) {