X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Ftail.c;h=181b752fd11328549c9e43f5c2de7e230b9737a2;hb=afc66d9ad479509171aa85f3dfb9217fabdefed2;hp=bcb157255fcd1a30a8048d7977271cb1dc46e027;hpb=1894607dc4c03ce20db7c5256c97890aa70bcaa5;p=collectd.git diff --git a/src/tail.c b/src/tail.c index bcb15725..181b752f 100644 --- a/src/tail.c +++ b/src/tail.c @@ -211,7 +211,6 @@ static int ctail_config_add_file (oconfig_item_t *ci) cu_tail_match_t *tm; char *plugin_instance = NULL; int num_matches = 0; - int status; int i; if ((ci->values_num != 1) || (ci->values[0].type != OCONFIG_TYPE_STRING)) @@ -224,20 +223,20 @@ static int ctail_config_add_file (oconfig_item_t *ci) if (tm == NULL) { ERROR ("tail plugin: tail_match_create (%s) failed.", - ci->values[0].value.string); + ci->values[0].value.string); return (-1); } - status = 0; for (i = 0; i < ci->children_num; i++) { oconfig_item_t *option = ci->children + i; + int status = 0; if (strcasecmp ("Match", option->key) == 0) { status = ctail_config_add_match (tm, plugin_instance, option); if (status == 0) - num_matches++; + num_matches++; /* Be mild with failed matches.. */ status = 0; } @@ -253,10 +252,12 @@ static int ctail_config_add_file (oconfig_item_t *ci) break; } /* for (i = 0; i < ci->children_num; i++) */ + sfree (plugin_instance); + if (num_matches == 0) { ERROR ("tail plugin: No (valid) matches found for file `%s'.", - ci->values[0].value.string); + ci->values[0].value.string); tail_match_destroy (tm); return (-1); } @@ -265,7 +266,7 @@ static int ctail_config_add_file (oconfig_item_t *ci) cu_tail_match_t **temp; temp = (cu_tail_match_t **) realloc (tail_match_list, - sizeof (cu_tail_match_t *) * (tail_match_list_num + 1)); + sizeof (cu_tail_match_t *) * (tail_match_list_num + 1)); if (temp == NULL) { ERROR ("tail plugin: realloc failed.");