projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
processes plugin: Fix error message.
[collectd.git]
/
src
/
thermal.c
diff --git
a/src/thermal.c
b/src/thermal.c
index
fbae6cc
..
9da8fa5
100644
(file)
--- a/
src/thermal.c
+++ b/
src/thermal.c
@@
-65,20
+65,20
@@
static int thermal_sysfs_device_read(const char __attribute__((unused)) * dir,
if (device_list && ignorelist_match(device_list, name))
return -1;
if (device_list && ignorelist_match(device_list, name))
return -1;
- s
s
nprintf(filename, sizeof(filename), "%s/%s/temp", dirname_sysfs, name);
+ snprintf(filename, sizeof(filename), "%s/%s/temp", dirname_sysfs, name);
if (parse_value_file(filename, &value, DS_TYPE_GAUGE) == 0) {
value.gauge /= 1000.0;
thermal_submit(name, TEMP, value);
success = 1;
}
if (parse_value_file(filename, &value, DS_TYPE_GAUGE) == 0) {
value.gauge /= 1000.0;
thermal_submit(name, TEMP, value);
success = 1;
}
- s
s
nprintf(filename, sizeof(filename), "%s/%s/cur_state", dirname_sysfs, name);
+ snprintf(filename, sizeof(filename), "%s/%s/cur_state", dirname_sysfs, name);
if (parse_value_file(filename, &value, DS_TYPE_GAUGE) == 0) {
thermal_submit(name, COOLING_DEV, value);
success = 1;
}
if (parse_value_file(filename, &value, DS_TYPE_GAUGE) == 0) {
thermal_submit(name, COOLING_DEV, value);
success = 1;
}
- return
(success ? 0 : -1)
;
+ return
success ? 0 : -1
;
}
static int thermal_procfs_device_read(const char __attribute__((unused)) * dir,
}
static int thermal_procfs_device_read(const char __attribute__((unused)) * dir,
@@
-98,8
+98,8
@@
static int thermal_procfs_device_read(const char __attribute__((unused)) * dir,
* temperature: 55 C
*/
* temperature: 55 C
*/
- len = s
s
nprintf(filename, sizeof(filename), "%s/%s/temperature",
-
dirname_procfs, name);
+ len = snprintf(filename, sizeof(filename), "%s/%s/temperature",
+ dirname_procfs, name);
if ((len < 0) || ((size_t)len >= sizeof(filename)))
return -1;
if ((len < 0) || ((size_t)len >= sizeof(filename)))
return -1;
@@
-168,13
+168,11
@@
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,
- /* user_data = */ NULL, /* include hidden */ 0);
+ return walk_directory(dirname_sysfs, thermal_sysfs_device_read, NULL, 0);
}
static int thermal_procfs_read(void) {
}
static int thermal_procfs_read(void) {
- return walk_directory(dirname_procfs, thermal_procfs_device_read,
- /* user_data = */ NULL, /* include hidden */ 0);
+ return walk_directory(dirname_procfs, thermal_procfs_device_read, NULL, 0);
}
static int thermal_init(void) {
}
static int thermal_init(void) {