libcollectdclient: Implement if_nametoindex() for Windows.

[collectd.git] / src / aquaero.c

diff --git a/src/aquaero.c b/src/aquaero.c
index 6e0d0d1..5db988e 100644 (file)
--- a/src/aquaero.c
+++ b/src/aquaero.c
@@ -31,33 +31,25 @@
 /* Default values for contacting daemon */
 static char *conf_device = NULL;
 
-static const char *config_keys[] =
+static int aquaero_config (oconfig_item_t *ci)
 {
-       "Device",
-};
-static int config_keys_num = STATIC_ARRAY_SIZE (config_keys);
-
+       int i;
 
-static int aquaero_config (const char *key, const char *value)
-{
-       if (strcasecmp (key, "Device") == 0)
+       for (i = 0; i < ci->children_num; i++)
        {
-               if (conf_device != NULL)
+               oconfig_item_t *child = ci->children + i;
+
+               if (strcasecmp ("Device", child->key))
+                       cf_util_get_string (child, &conf_device);
+               else
                {
-                       free (conf_device);
-                       conf_device = NULL;
+                       ERROR ("aquaero plugin: Unknown config option \"%s\".",
+                                       child->key);
                }
-               if (value[0] == '\0')
-                       return (0);
-               if ((conf_device = strdup (value)) == NULL)
-                       return (1);
-       }
-       else
-       {
-               return (-1);
        }
+
        return (0);
-} /* int aquaero_config */
+}
 
 static int aquaero_shutdown (void)
 {
@@ -166,7 +158,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]);
@@ -185,7 +177,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);
@@ -193,8 +185,7 @@ static int aquaero_read (void)
 
 void module_register (void)
 {
-       plugin_register_config ("aquaero", aquaero_config, config_keys,
-                       config_keys_num);
+       plugin_register_complex_config ("aquaero", aquaero_config);
        plugin_register_read ("aquaero", aquaero_read);
        plugin_register_shutdown ("aquaero", aquaero_shutdown);
 } /* void module_register */