X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fmatch_value.c;h=3b269c8c9c061ff77a7ddf7b7bc9a53af3c58dc4;hb=3fae5596643f1e361eb18c3d65448f8bc02fdd80;hp=8c6fd36c9456581577270695992a46a772001f4b;hpb=129fdc526ba4ad6b5bd1f7db296eb11c1a9c75bd;p=collectd.git diff --git a/src/match_value.c b/src/match_value.c index 8c6fd36c..3b269c8c 100644 --- a/src/match_value.c +++ b/src/match_value.c @@ -59,7 +59,7 @@ struct mv_match_s static void mv_free_match (mv_match_t *m) /* {{{ */ { size_t i; - + if (m == NULL) return; @@ -69,7 +69,7 @@ static void mv_free_match (mv_match_t *m) /* {{{ */ free(m->data_sources[i]); free(m->data_sources); } - + free (m); } /* }}} void mv_free_match */ @@ -129,7 +129,7 @@ static int mv_config_add_data_source (mv_match_t *m, /* {{{ */ /* Allocate space for the char pointers */ new_data_sources_num = m->data_sources_num + ((size_t) ci->values_num); - temp = (char **) realloc (m->data_sources, + temp = realloc (m->data_sources, new_data_sources_num * sizeof (char *)); if (temp == NULL) { @@ -335,7 +335,7 @@ static int mv_match (const data_set_t *ds, const value_list_t *vl, /* {{{ */ if (m->satisfy == SATISFY_ANY) break; } - else if (value_matches == 0) + else { status = FC_MATCH_NO_MATCH; if (m->satisfy == SATISFY_ALL) @@ -349,9 +349,8 @@ static int mv_match (const data_set_t *ds, const value_list_t *vl, /* {{{ */ void module_register (void) { - match_proc_t mproc; + match_proc_t mproc = { 0 }; - memset (&mproc, 0, sizeof (mproc)); mproc.create = mv_create; mproc.destroy = mv_destroy; mproc.match = mv_match;