X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faquaero.c;h=81a4efd4337257865dd78d293d065572c3aa7b7e;hb=51181b899668ad2c232a152d6e5e787c4eb049cc;hp=84c797bcdb39eeb9faa457d1a7f51c7675c2f62e;hpb=4ab54ded3b73d5051230bb35eecf766a51dee786;p=collectd.git

diff --git a/src/aquaero.c b/src/aquaero.c
index 84c797bc..81a4efd4 100644
--- a/src/aquaero.c
+++ b/src/aquaero.c
@@ -20,6 +20,7 @@
  **/
 
 #include "collectd.h"
+
 #include "common.h"
 #include "plugin.h"
 
@@ -33,9 +34,7 @@ static char *conf_device = NULL;
 
 static int aquaero_config (oconfig_item_t *ci)
 {
-	int i;
-
-	for (i = 0; i < ci->children_num; i++)
+	for (int i = 0; i < ci->children_num; i++)
 	{
 		oconfig_item_t *child = ci->children + i;
 
@@ -87,9 +86,8 @@ static void aquaero_submit_array (const char *type,
 		const char *type_instance_prefix, double *value_array, int len)
 {
 	char type_instance[DATA_MAX_NAME_LEN];
-	int i;
 
-	for (i = 0; i < len; i++)
+	for (int i = 0; i < len; i++)
 	{
 		if (value_array[i] == AQ5_FLOAT_UNDEF)
 			continue;
@@ -106,7 +104,6 @@ static int aquaero_read (void)
 	aq5_settings_t aq_sett;
 	char *err_msg = NULL;
 	char type_instance[DATA_MAX_NAME_LEN];
-	int i;
 
 	if (libaquaero5_poll(conf_device, &aq_data, &err_msg) < 0)
 	{
@@ -147,7 +144,7 @@ static int aquaero_read (void)
 			AQ5_NUM_OTHER_SENSORS);
 
 	/* Fans */
-	for (i = 0; i < AQ5_NUM_FAN; i++)
+	for (int i = 0; i < AQ5_NUM_FAN; i++)
 	{
 		if ((aq_sett.fan_data_source[i] == NONE)
 				|| (aq_data.fan_vrm_temp[i] != AQ5_FLOAT_UNDEF))
@@ -158,7 +155,7 @@ static int aquaero_read (void)
 
 		aquaero_submit ("fanspeed", type_instance,
 				aq_data.fan_rpm[i]);
-		aquaero_submit ("percentage", type_instance,
+		aquaero_submit ("percent", type_instance,
 				aq_data.fan_duty[i]);
 		aquaero_submit ("voltage", type_instance,
 				aq_data.fan_voltage[i]);
@@ -177,7 +174,7 @@ static int aquaero_read (void)
 	aquaero_submit_array("flow", "sensor", aq_data.flow, AQ5_NUM_FLOW);
 
 	/* Liquid level */
-	aquaero_submit_array("percentage", "waterlevel",
+	aquaero_submit_array("percent", "waterlevel",
 			aq_data.level, AQ5_NUM_LEVEL);
 
 	return (0);