X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_tail_match.c;h=22c7917943524ed3c3ee06415cc3159b3ab61892;hb=0742dc6da5074abaf3bb27c579de12460f7db690;hp=34fe2dced95c91fc5a493dc71a724248ceec45a1;hpb=917343b099777d5aae031c5062b01e4d3a694b5a;p=collectd.git diff --git a/src/utils_tail_match.c b/src/utils_tail_match.c index 34fe2dce..22c79179 100644 --- a/src/utils_tail_match.c +++ b/src/utils_tail_match.c @@ -80,15 +80,15 @@ static int simple_submit_match (cu_match_t *match, void *user_data) vl.values = values; vl.values_len = 1; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, data->plugin, sizeof (vl.plugin)); sstrncpy (vl.plugin_instance, data->plugin_instance, sizeof (vl.plugin_instance)); + sstrncpy (vl.type, data->type, sizeof (vl.type)); sstrncpy (vl.type_instance, data->type_instance, sizeof (vl.type_instance)); - plugin_dispatch_values (data->type, &vl); + plugin_dispatch_values (&vl); if (match_value->ds_type & UTILS_MATCH_DS_TYPE_GAUGE) { @@ -99,10 +99,11 @@ static int simple_submit_match (cu_match_t *match, void *user_data) return (0); } /* int simple_submit_match */ -static int tail_callback (void *data, char *buf, int buflen) +static int tail_callback (void *data, char *buf, + int __attribute__((unused)) buflen) { cu_tail_match_t *obj = (cu_tail_match_t *) data; - int i; + size_t i; for (i = 0; i < obj->matches_num; i++) match_apply (obj->matches[i].match, buf); @@ -134,7 +135,7 @@ cu_tail_match_t *tail_match_create (const char *filename) void tail_match_destroy (cu_tail_match_t *obj) { - int i; + size_t i; if (obj == NULL) return; @@ -236,7 +237,7 @@ int tail_match_read (cu_tail_match_t *obj) { char buffer[4096]; int status; - int i; + size_t i; status = cu_tail_read (obj->tail, buffer, sizeof (buffer), tail_callback, (void *) obj);