X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftarget_set.c;h=4f00cbbdaf1aedbc2bf6eedbdf60a003e826e9b5;hb=5523a080010dcb7a61dc0dccc3969a2a048e52f9;hp=2060dcde6b050e1616acc83481ce48ea5a957098;hpb=362a519e00d50fc3657d485135075f753ec71bab;p=collectd.git diff --git a/src/target_set.c b/src/target_set.c index 2060dcde..4f00cbbd 100644 --- a/src/target_set.c +++ b/src/target_set.c @@ -25,6 +25,7 @@ **/ #include "collectd.h" + #include "common.h" #include "filter_chain.h" @@ -142,7 +143,6 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ { ts_data_t *data; int status; - int i; data = calloc (1, sizeof (*data)); if (data == NULL) @@ -159,7 +159,7 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ data->meta = NULL; status = 0; - for (i = 0; i < ci->children_num; i++) + for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -181,7 +181,7 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ else if (strcasecmp ("TypeInstance", child->key) == 0) status = ts_config_add_string (&data->type_instance, child, /* may be empty = */ 1); - else if (strcasecmp ("MetaDataSet", child->key) == 0) + else if (strcasecmp ("MetaData", child->key) == 0) status = ts_config_add_meta (&data->meta, child, /* may be empty = */ 1); else @@ -206,8 +206,7 @@ static int ts_create (const oconfig_item_t *ci, void **user_data) /* {{{ */ && (data->meta == NULL)) { ERROR ("Target `set': You need to set at least one of `Host', " - "`Plugin', `PluginInstance', `TypeInstance', " - "`MetaDataSet' or `MetaDataEval'."); + "`Plugin', `PluginInstance', `TypeInstance', `MetaData'."); status = -1; }