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-5.7'
[collectd.git]
/
src
/
battery.c
diff --git
a/src/battery.c
b/src/battery.c
index
5c02fee
..
78e96b2
100644
(file)
--- a/
src/battery.c
+++ b/
src/battery.c
@@
-350,10
+350,12
@@
static int sysfs_file_to_buffer(char const *dir, /* {{{ */
ssnprintf(filename, sizeof(filename), "%s/%s/%s", dir, power_supply,
basename);
ssnprintf(filename, sizeof(filename), "%s/%s/%s", dir, power_supply,
basename);
- status = (int)read_file_contents(filename, buffer, buffer_size);
+ status = (int)read_file_contents(filename, buffer, buffer_size
- 1
);
if (status < 0)
return status;
if (status < 0)
return status;
+ buffer[status] = '\0';
+
strstripnewline(buffer);
return 0;
} /* }}} int sysfs_file_to_buffer */
strstripnewline(buffer);
return 0;
} /* }}} int sysfs_file_to_buffer */
@@
-364,7
+366,7
@@
static int sysfs_file_to_gauge(char const *dir, /* {{{ */
char const *power_supply, char const *basename,
gauge_t *ret_value) {
int status;
char const *power_supply, char const *basename,
gauge_t *ret_value) {
int status;
- char buffer[32]
= ""
;
+ char buffer[32];
status =
sysfs_file_to_buffer(dir, power_supply, basename, buffer, sizeof(buffer));
status =
sysfs_file_to_buffer(dir, power_supply, basename, buffer, sizeof(buffer));