projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
filecount plugin: malloc + memset -> calloc
[collectd.git]
/
src
/
utils_db_query.c
diff --git
a/src/utils_db_query.c
b/src/utils_db_query.c
index
36181ee
..
de435cb
100644
(file)
--- a/
src/utils_db_query.c
+++ b/
src/utils_db_query.c
@@
-207,7
+207,7
@@
static int udb_result_submit (udb_result_t *r, /* {{{ */
vl.values = (value_t *) calloc (r->values_num, sizeof (value_t));
if (vl.values == NULL)
{
vl.values = (value_t *) calloc (r->values_num, sizeof (value_t));
if (vl.values == NULL)
{
- ERROR ("db query utils:
m
alloc failed.");
+ ERROR ("db query utils:
c
alloc failed.");
return (-1);
}
vl.values_len = r_area->ds->ds_num;
return (-1);
}
vl.values_len = r_area->ds->ds_num;
@@
-371,10
+371,10
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
BAIL_OUT (-1);
}
BAIL_OUT (-1);
}
- if (
((size_t) prep_area->ds->ds_num)
!= r->values_num)
+ if (
prep_area->ds->ds_num
!= r->values_num)
{
ERROR ("db query utils: udb_result_prepare_result: The type `%s' "
{
ERROR ("db query utils: udb_result_prepare_result: The type `%s' "
- "requires exactly %
i
value%s, but the configuration specifies %zu.",
+ "requires exactly %
zu
value%s, but the configuration specifies %zu.",
r->type,
prep_area->ds->ds_num, (prep_area->ds->ds_num == 1) ? "" : "s",
r->values_num);
r->type,
prep_area->ds->ds_num, (prep_area->ds->ds_num == 1) ? "" : "s",
r->values_num);
@@
-390,7
+390,7
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
= (size_t *) calloc (r->instances_num, sizeof (size_t));
if (prep_area->instances_pos == NULL)
{
= (size_t *) calloc (r->instances_num, sizeof (size_t));
if (prep_area->instances_pos == NULL)
{
- ERROR ("db query utils: udb_result_prepare_result:
m
alloc failed.");
+ ERROR ("db query utils: udb_result_prepare_result:
c
alloc failed.");
BAIL_OUT (-ENOMEM);
}
BAIL_OUT (-ENOMEM);
}
@@
-398,7
+398,7
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
= (char **) calloc (r->instances_num, sizeof (char *));
if (prep_area->instances_buffer == NULL)
{
= (char **) calloc (r->instances_num, sizeof (char *));
if (prep_area->instances_buffer == NULL)
{
- ERROR ("db query utils: udb_result_prepare_result:
m
alloc failed.");
+ ERROR ("db query utils: udb_result_prepare_result:
c
alloc failed.");
BAIL_OUT (-ENOMEM);
}
} /* if (r->instances_num > 0) */
BAIL_OUT (-ENOMEM);
}
} /* if (r->instances_num > 0) */
@@
-407,7
+407,7
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
= (size_t *) calloc (r->values_num, sizeof (size_t));
if (prep_area->values_pos == NULL)
{
= (size_t *) calloc (r->values_num, sizeof (size_t));
if (prep_area->values_pos == NULL)
{
- ERROR ("db query utils: udb_result_prepare_result:
m
alloc failed.");
+ ERROR ("db query utils: udb_result_prepare_result:
c
alloc failed.");
BAIL_OUT (-ENOMEM);
}
BAIL_OUT (-ENOMEM);
}
@@
-415,7
+415,7
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
= (char **) calloc (r->values_num, sizeof (char *));
if (prep_area->values_buffer == NULL)
{
= (char **) calloc (r->values_num, sizeof (char *));
if (prep_area->values_buffer == NULL)
{
- ERROR ("db query utils: udb_result_prepare_result:
m
alloc failed.");
+ ERROR ("db query utils: udb_result_prepare_result:
c
alloc failed.");
BAIL_OUT (-ENOMEM);
}
BAIL_OUT (-ENOMEM);
}
@@
-423,7
+423,7
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
= (size_t *) calloc (r->metadata_num, sizeof (size_t));
if (prep_area->metadata_pos == NULL)
{
= (size_t *) calloc (r->metadata_num, sizeof (size_t));
if (prep_area->metadata_pos == NULL)
{
- ERROR ("db query utils: udb_result_prepare_result:
m
alloc failed.");
+ ERROR ("db query utils: udb_result_prepare_result:
c
alloc failed.");
BAIL_OUT (-ENOMEM);
}
BAIL_OUT (-ENOMEM);
}
@@
-431,7
+431,7
@@
static int udb_result_prepare_result (udb_result_t const *r, /* {{{ */
= (char **) calloc (r->metadata_num, sizeof (char *));
if (prep_area->metadata_buffer == NULL)
{
= (char **) calloc (r->metadata_num, sizeof (char *));
if (prep_area->metadata_buffer == NULL)
{
- ERROR ("db query utils: udb_result_prepare_result:
m
alloc failed.");
+ ERROR ("db query utils: udb_result_prepare_result:
c
alloc failed.");
BAIL_OUT (-ENOMEM);
}
BAIL_OUT (-ENOMEM);
}
@@
-550,7
+550,7
@@
static int udb_result_create (const char *query_name, /* {{{ */
ci->values_num, (ci->values_num == 1) ? "" : "s");
}
ci->values_num, (ci->values_num == 1) ? "" : "s");
}
- r =
(udb_result_t *)
malloc (sizeof (*r));
+ r = malloc (sizeof (*r));
if (r == NULL)
{
ERROR ("db query utils: malloc failed.");
if (r == NULL)
{
ERROR ("db query utils: malloc failed.");
@@
-678,7
+678,7
@@
int udb_query_create (udb_query_t ***ret_query_list, /* {{{ */
return (-1);
}
return (-1);
}
- q =
(udb_query_t *)
malloc (sizeof (*q));
+ q = malloc (sizeof (*q));
if (q == NULL)
{
ERROR ("db query utils: malloc failed.");
if (q == NULL)
{
ERROR ("db query utils: malloc failed.");