projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2688 from dstathis/master
[collectd.git]
/
src
/
aquaero.c
diff --git
a/src/aquaero.c
b/src/aquaero.c
index
22278e0
..
beffc1a
100644
(file)
--- a/
src/aquaero.c
+++ b/
src/aquaero.c
@@
-43,12
+43,12
@@
static int aquaero_config(oconfig_item_t *ci) {
}
}
}
}
- return
(0)
;
+ return
0
;
}
static int aquaero_shutdown(void) {
libaquaero5_exit();
}
static int aquaero_shutdown(void) {
libaquaero5_exit();
- return
(0)
;
+ return
0
;
} /* int aquaero_shutdown */
static void aquaero_submit(const char *type, const char *type_instance,
} /* int aquaero_shutdown */
static void aquaero_submit(const char *type, const char *type_instance,
@@
-94,20
+94,16
@@
static int aquaero_read(void) {
char type_instance[DATA_MAX_NAME_LEN];
if (libaquaero5_poll(conf_device, &aq_data, &err_msg) < 0) {
char type_instance[DATA_MAX_NAME_LEN];
if (libaquaero5_poll(conf_device, &aq_data, &err_msg) < 0) {
- char errbuf[1024];
ERROR("aquaero plugin: Failed to poll device \"%s\": %s (%s)",
ERROR("aquaero plugin: Failed to poll device \"%s\": %s (%s)",
- conf_device ? conf_device : "default", err_msg,
- sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ conf_device ? conf_device : "default", err_msg, STRERRNO);
+ return -1;
}
if (libaquaero5_getsettings(conf_device, &aq_sett, &err_msg) < 0) {
}
if (libaquaero5_getsettings(conf_device, &aq_sett, &err_msg) < 0) {
- char errbuf[1024];
ERROR("aquaero plugin: Failed to get settings "
"for device \"%s\": %s (%s)",
ERROR("aquaero plugin: Failed to get settings "
"for device \"%s\": %s (%s)",
- conf_device ? conf_device : "default", err_msg,
- sstrerror(errno, errbuf, sizeof(errbuf)));
- return (-1);
+ conf_device ? conf_device : "default", err_msg, STRERRNO);
+ return -1;
}
/* CPU Temperature sensor */
}
/* CPU Temperature sensor */
@@
-153,7
+149,7
@@
static int aquaero_read(void) {
/* Liquid level */
aquaero_submit_array("percent", "waterlevel", aq_data.level, AQ5_NUM_LEVEL);
/* Liquid level */
aquaero_submit_array("percent", "waterlevel", aq_data.level, AQ5_NUM_LEVEL);
- return
(0)
;
+ return
0
;
}
void module_register(void) {
}
void module_register(void) {