projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.4' into collectd-4.5
[collectd.git]
/
src
/
thermal.c
diff --git
a/src/thermal.c
b/src/thermal.c
index
9378132
..
b613648
100644
(file)
--- a/
src/thermal.c
+++ b/
src/thermal.c
@@
-61,7
+61,8
@@
static void thermal_submit (const char *plugin_instance, enum dev_type dt,
plugin_dispatch_values (&vl);
}
plugin_dispatch_values (&vl);
}
-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];
{
char filename[256];
char data[1024];
@@
-112,7
+113,8
@@
static int thermal_sysfs_device_read (const char *name)
return ok ? 0 : -1;
}
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];
{
const char str_temp[] = "temperature:";
char filename[256];
@@
-215,12
+217,14
@@
static int thermal_config (const char *key, const char *value)
static int thermal_sysfs_read (void)
{
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)
{
}
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)
}
static int thermal_init (void)