projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1830 from rubenk/move-collectd-header
[collectd.git]
/
src
/
dbi.c
diff --git
a/src/dbi.c
b/src/dbi.c
index
655581e
..
78ac777
100644
(file)
--- a/
src/dbi.c
+++ b/
src/dbi.c
@@
-25,6
+25,7
@@
**/
#include "collectd.h"
**/
#include "collectd.h"
+
#include "common.h"
#include "plugin.h"
#include "configfile.h"
#include "common.h"
#include "plugin.h"
#include "configfile.h"
@@
-240,7
+241,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)
{
@@
-386,7
+387,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)
{
@@
-395,14
+396,13
@@
static int cdbi_config_add_database (oconfig_item_t *ci) /* {{{ */
}
else
{
}
else
{
- user_data_t ud;
+ user_data_t ud
= { 0 }
;
char *name = NULL;
databases = temp;
databases[databases_num] = db;
databases_num++;
char *name = NULL;
databases = temp;
databases[databases_num] = db;
databases_num++;
- memset (&ud, 0, sizeof (ud));
ud.data = (void *) db;
ud.free_func = NULL;
name = ssnprintf_alloc("dbi:%s", db->name);
ud.data = (void *) db;
ud.free_func = NULL;
name = ssnprintf_alloc("dbi:%s", db->name);
@@
-510,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);