Merge branch 'ff/local'

[collectd.git] / src / thermal.c

diff --git a/src/thermal.c b/src/thermal.c
index 29ea05f..79033b1 100644 (file)
--- a/src/thermal.c
+++ b/src/thermal.c
@@ -51,7 +51,6 @@ static void thermal_submit (const char *plugin_instance, enum dev_type dt,
        vt.gauge = value;
 
        vl.values = &vt;
-       vl.time = time (NULL);
        sstrncpy (vl.plugin, "thermal", sizeof(vl.plugin));
        sstrncpy (vl.plugin_instance, plugin_instance,
                        sizeof(vl.plugin_instance));
@@ -61,21 +60,8 @@ static void thermal_submit (const char *plugin_instance, enum dev_type dt,
        plugin_dispatch_values (&vl);
 }
 
-static int read_file_contents (const char *filename, char *buf, int bufsize)
-{
-       FILE *fh;
-       int n;
-
-       if ((fh = fopen (filename, "r")) == NULL)
-               return -1;
-
-       n = fread(buf, 1, bufsize, fh);
-       fclose(fh);
-
-       return n;
-}
-
-static int thermal_sysfs_device_read (const char *name)
+static int thermal_sysfs_device_read (const char *dir, const char *name,
+               void *user_data)
 {
        char filename[256];
        char data[1024];
@@ -126,7 +112,8 @@ static int thermal_sysfs_device_read (const char *name)
        return ok ? 0 : -1;
 }
 
-static int thermal_procfs_device_read (const char *name)
+static int thermal_procfs_device_read (const char *dir, const char *name,
+               void *user_data)
 {
        const char str_temp[] = "temperature:";
        char filename[256];
@@ -229,12 +216,14 @@ static int thermal_config (const char *key, const char *value)
 
 static int thermal_sysfs_read (void)
 {
-       return walk_directory (dirname_sysfs, thermal_sysfs_device_read);
+       return walk_directory (dirname_sysfs, thermal_sysfs_device_read,
+                       /* user_data = */ NULL);
 }
 
 static int thermal_procfs_read (void)
 {
-       return walk_directory (dirname_procfs, thermal_procfs_device_read);
+       return walk_directory (dirname_procfs, thermal_procfs_device_read,
+                       /* user_data = */ NULL);
 }
 
 static int thermal_init (void)