X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faquaero.c;h=937742b0af0f4cc89ab4f60c3ea22ae590570d87;hb=7c9d772c992647fcba64a96800c146eb9f1647f8;hp=4a78f6859c5fc048ddefbb8a7ac555de94a350a5;hpb=e4504c3cc5582ab915903e1b4ba010545ffc8354;p=collectd.git diff --git a/src/aquaero.c b/src/aquaero.c index 4a78f685..937742b0 100644 --- a/src/aquaero.c +++ b/src/aquaero.c @@ -30,7 +30,7 @@ * Private variables */ /* Default values for contacting daemon */ -static char *conf_device = NULL; +static char *conf_device; static int aquaero_config(oconfig_item_t *ci) { for (int i = 0; i < ci->children_num; i++) { @@ -43,12 +43,12 @@ static int aquaero_config(oconfig_item_t *ci) { } } - return (0); + return 0; } 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, @@ -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 errbuf[1024]; 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) { - char errbuf[1024]; 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 */ @@ -153,7 +149,7 @@ static int aquaero_read(void) { /* Liquid level */ aquaero_submit_array("percent", "waterlevel", aq_data.level, AQ5_NUM_LEVEL); - return (0); + return 0; } void module_register(void) { @@ -161,5 +157,3 @@ void module_register(void) { plugin_register_read("aquaero", aquaero_read); plugin_register_shutdown("aquaero", aquaero_shutdown); } /* void module_register */ - -/* vim: set sw=8 sts=8 noet : */