projects
/
collectd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d33c414
)
aquaero plugin: Use the "complex" configuration.
author
Florian Forster
<octo@collectd.org>
Sun, 18 Aug 2013 08:56:28 +0000
(10:56 +0200)
committer
Florian Forster
<octo@collectd.org>
Sun, 18 Aug 2013 08:56:28 +0000
(10:56 +0200)
Actually less LOC.
src/aquaero.c
patch
|
blob
|
history
diff --git
a/src/aquaero.c
b/src/aquaero.c
index
6e0d0d1
..
84c797b
100644
(file)
--- a/
src/aquaero.c
+++ b/
src/aquaero.c
@@
-31,33
+31,25
@@
/* Default values for contacting daemon */
static char *conf_device = NULL;
/* 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);
return (0);
-}
/* int aquaero_config */
+}
static int aquaero_shutdown (void)
{
static int aquaero_shutdown (void)
{
@@
-193,8
+185,7
@@
static int aquaero_read (void)
void module_register (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 */
plugin_register_read ("aquaero", aquaero_read);
plugin_register_shutdown ("aquaero", aquaero_shutdown);
} /* void module_register */