projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
src/Makefile: Don't unnecessarily set plugin specific CXXFLAGS.
[collectd.git]
/
src
/
dbi.c
diff --git
a/src/dbi.c
b/src/dbi.c
index
94d0762
..
273cce8
100644
(file)
--- a/
src/dbi.c
+++ b/
src/dbi.c
@@
-148,7
+148,7
@@
static int cdbi_result_get_field (dbi_result res, /* {{{ */
else if (src_type == DBI_TYPE_STRING)
{
const char *value;
else if (src_type == DBI_TYPE_STRING)
{
const char *value;
-
+
value = dbi_result_get_string_idx (res, index);
if (value == NULL)
sstrncpy (buffer, "", buffer_size);
value = dbi_result_get_string_idx (res, index);
if (value == NULL)
sstrncpy (buffer, "", buffer_size);
@@
-214,7
+214,7
@@
static void cdbi_database_free (cdbi_database_t *db) /* {{{ */
* </Result>
* ...
* </Query>
* </Result>
* ...
* </Query>
- *
+ *
* <Database "plugin_instance1">
* Driver "mysql"
* Interval 120
* <Database "plugin_instance1">
* Driver "mysql"
* Interval 120
@@
-240,7
+240,7
@@
static int cdbi_config_add_database_driver_option (cdbi_database_t *db, /* {{{ *
return (-1);
}
return (-1);
}
- option =
(cdbi_driver_option_t *)
realloc (db->driver_options,
+ option = realloc (db->driver_options,
sizeof (*option) * (db->driver_options_num + 1));
if (option == NULL)
{
sizeof (*option) * (db->driver_options_num + 1));
if (option == NULL)
{
@@
-294,13
+294,12
@@
static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
return (-1);
}
return (-1);
}
- db =
(cdbi_database_t *) malloc (
sizeof (*db));
+ db =
calloc (1,
sizeof (*db));
if (db == NULL)
{
if (db == NULL)
{
- ERROR ("dbi plugin:
m
alloc failed.");
+ ERROR ("dbi plugin:
c
alloc failed.");
return (-1);
}
return (-1);
}
- memset (db, 0, sizeof (*db));
status = cf_util_get_string (ci, &db->name);
if (status != 0)
status = cf_util_get_string (ci, &db->name);
if (status != 0)
@@
-357,12
+356,11
@@
static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
while ((status == 0) && (db->queries_num > 0))
{
size_t j;
while ((status == 0) && (db->queries_num > 0))
{
size_t j;
- db->q_prep_areas = (udb_query_preparation_area_t **) calloc (
- db->queries_num, sizeof (*db->q_prep_areas));
+ db->q_prep_areas = calloc (db->queries_num, sizeof (*db->q_prep_areas));
if (db->q_prep_areas == NULL)
{
if (db->q_prep_areas == NULL)
{
- WARNING ("dbi plugin:
m
alloc failed");
+ WARNING ("dbi plugin:
c
alloc failed");
status = -1;
break;
}
status = -1;
break;
}
@@
-388,7
+386,7
@@
static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
{
cdbi_database_t **temp;
{
cdbi_database_t **temp;
- temp =
(cdbi_database_t **)
realloc (databases,
+ temp = realloc (databases,
sizeof (*databases) * (databases_num + 1));
if (temp == NULL)
{
sizeof (*databases) * (databases_num + 1));
if (temp == NULL)
{
@@
-512,7
+510,6
@@
static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
column_names = NULL;
column_values = NULL;
column_names = NULL;
column_values = NULL;
- res = NULL;
statement = udb_query_get_statement (q);
assert (statement != NULL);
statement = udb_query_get_statement (q);
assert (statement != NULL);
@@
-548,35
+545,33
@@
static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
}
/* Allocate `column_names' and `column_values'. {{{ */
}
/* Allocate `column_names' and `column_values'. {{{ */
- column_names =
(char **) calloc (column_num, sizeof (char *
));
+ column_names =
calloc (column_num, sizeof (*column_names
));
if (column_names == NULL)
{
if (column_names == NULL)
{
- ERROR ("dbi plugin:
m
alloc failed.");
+ ERROR ("dbi plugin:
c
alloc failed.");
BAIL_OUT (-1);
}
BAIL_OUT (-1);
}
- column_names[0] = (char *) calloc (column_num,
- DATA_MAX_NAME_LEN * sizeof (char));
+ column_names[0] = calloc (column_num, DATA_MAX_NAME_LEN);
if (column_names[0] == NULL)
{
if (column_names[0] == NULL)
{
- ERROR ("dbi plugin:
m
alloc failed.");
+ ERROR ("dbi plugin:
c
alloc failed.");
BAIL_OUT (-1);
}
for (i = 1; i < column_num; i++)
column_names[i] = column_names[i - 1] + DATA_MAX_NAME_LEN;
BAIL_OUT (-1);
}
for (i = 1; i < column_num; i++)
column_names[i] = column_names[i - 1] + DATA_MAX_NAME_LEN;
- column_values =
(char **) calloc (column_num, sizeof (char *
));
+ column_values =
calloc (column_num, sizeof (*column_values
));
if (column_values == NULL)
{
if (column_values == NULL)
{
- ERROR ("dbi plugin:
m
alloc failed.");
+ ERROR ("dbi plugin:
c
alloc failed.");
BAIL_OUT (-1);
}
BAIL_OUT (-1);
}
- column_values[0] = (char *) calloc (column_num,
- DATA_MAX_NAME_LEN * sizeof (char));
+ column_values[0] = calloc (column_num, DATA_MAX_NAME_LEN);
if (column_values[0] == NULL)
{
if (column_values[0] == NULL)
{
- ERROR ("dbi plugin:
m
alloc failed.");
+ ERROR ("dbi plugin:
c
alloc failed.");
BAIL_OUT (-1);
}
for (i = 1; i < column_num; i++)
BAIL_OUT (-1);
}
for (i = 1; i < column_num; i++)