diff --git a/src/match_value.c b/src/match_value.c
index 4d49984f618173b48323634a3ed34a1b85cde048..54ddba28e6cdea3a32af5fe3328cf5a3bd029839 100644 (file)
--- a/src/match_value.c
+++ b/src/match_value.c
*/
#include "collectd.h"
*/
#include "collectd.h"
+
#include "common.h"
#include "utils_cache.h"
#include "filter_chain.h"
#include "common.h"
#include "utils_cache.h"
#include "filter_chain.h"
*/
static void mv_free_match (mv_match_t *m) /* {{{ */
{
*/
static void mv_free_match (mv_match_t *m) /* {{{ */
{
- int i;
-
if (m == NULL)
return;
if (m->data_sources != NULL)
{
if (m == NULL)
return;
if (m->data_sources != NULL)
{
- for (i = 0; i < m->data_sources_num; ++i)
+ for (size_t i = 0; i < m->data_sources_num; ++i)
free(m->data_sources[i]);
free(m->data_sources);
}
free(m->data_sources[i]);
free(m->data_sources);
}
-
+
free (m);
} /* }}} void mv_free_match */
free (m);
} /* }}} void mv_free_match */
{
size_t new_data_sources_num;
char **temp;
{
size_t new_data_sources_num;
char **temp;
- int i;
/* Check number of arbuments. */
if (ci->values_num < 1)
/* Check number of arbuments. */
if (ci->values_num < 1)
}
/* Check type of arguments */
}
/* Check type of arguments */
- for (i = 0; i < ci->values_num; i++)
+ for (int i = 0; i < ci->values_num; i++)
{
if (ci->values[i].type == OCONFIG_TYPE_STRING)
continue;
{
if (ci->values[i].type == OCONFIG_TYPE_STRING)
continue;
/* Allocate space for the char pointers */
new_data_sources_num = m->data_sources_num + ((size_t) ci->values_num);
/* 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)
{
new_data_sources_num * sizeof (char *));
if (temp == NULL)
{
m->data_sources = temp;
/* Copy the strings, allocating memory as needed. */
m->data_sources = temp;
/* Copy the strings, allocating memory as needed. */
- for (i = 0; i < ci->values_num; i++)
+ for (int i = 0; i < ci->values_num; i++)
{
{
- size_t j;
-
/* If we get here, there better be memory for us to write to. */
assert (m->data_sources_num < new_data_sources_num);
/* If we get here, there better be memory for us to write to. */
assert (m->data_sources_num < new_data_sources_num);
- j = m->data_sources_num;
+ size_t j = m->data_sources_num;
m->data_sources[j] = sstrdup (ci->values[i].value.string);
if (m->data_sources[j] == NULL)
{
m->data_sources[j] = sstrdup (ci->values[i].value.string);
if (m->data_sources[j] == NULL)
{
{
mv_match_t *m;
int status;
{
mv_match_t *m;
int status;
- int i;
- m = (mv_match_t *) malloc (sizeof (*m));
+ m = calloc (1, sizeof (*m));
if (m == NULL)
{
if (m == NULL)
{
- ERROR ("mv_create: malloc failed.");
+ ERROR ("mv_create: calloc failed.");
return (-ENOMEM);
}
return (-ENOMEM);
}
- memset (m, 0, sizeof (*m));
m->min = NAN;
m->max = NAN;
m->min = NAN;
m->max = NAN;
m->data_sources_num = 0;
status = 0;
m->data_sources_num = 0;
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;
{
oconfig_item_t *child = ci->children + i;
mv_match_t *m;
gauge_t *values;
int status;
mv_match_t *m;
gauge_t *values;
int status;
- int i;
if ((user_data == NULL) || (*user_data == NULL))
return (-1);
if ((user_data == NULL) || (*user_data == NULL))
return (-1);
status = FC_MATCH_NO_MATCH;
status = FC_MATCH_NO_MATCH;
- for (i = 0; i < ds->ds_num; i++)
+ for (size_t i = 0; i < ds->ds_num; i++)
{
int value_matches = 0;
{
int value_matches = 0;
if (m->satisfy == SATISFY_ANY)
break;
}
if (m->satisfy == SATISFY_ANY)
break;
}
- else if (value_matches == 0)
+ else
{
status = FC_MATCH_NO_MATCH;
if (m->satisfy == SATISFY_ALL)
{
status = FC_MATCH_NO_MATCH;
if (m->satisfy == SATISFY_ALL)
void module_register (void)
{
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;
mproc.create = mv_create;
mproc.destroy = mv_destroy;
mproc.match = mv_match;