diff --git a/src/postgresql.c b/src/postgresql.c
index 87a56b7fb7b2fc802174d2abb2423b45b30d342e..6cf563181ab662099fe4f7a75ab76f257fec532e 100644 (file)
--- a/src/postgresql.c
+++ b/src/postgresql.c
int ref_cnt;
} c_psql_database_t;
int ref_cnt;
} c_psql_database_t;
-static char *def_queries[] = {
+static const char *const def_queries[] = {
"backends",
"transactions",
"queries",
"backends",
"transactions",
"queries",
c_psql_database_t **tmp;
c_psql_database_t *db;
c_psql_database_t **tmp;
c_psql_database_t *db;
- db = (c_psql_database_t *)malloc (sizeof(*db));
+ db = malloc (sizeof(*db));
if (NULL == db) {
log_err ("Out of memory.");
return NULL;
if (NULL == db) {
log_err ("Out of memory.");
return NULL;
static PGresult *c_psql_exec_query_params (c_psql_database_t *db,
udb_query_t *q, c_psql_user_data_t *data)
{
static PGresult *c_psql_exec_query_params (c_psql_database_t *db,
udb_query_t *q, c_psql_user_data_t *data)
{
- char *params[db->max_params_num];
- char interval[64];
- int i;
+ const char *params[db->max_params_num];
+ char interval[64];
+ int i;
if ((data == NULL) || (data->params_num == 0))
return (c_psql_exec_query_noparams (db, q));
if ((data == NULL) || (data->params_num == 0))
return (c_psql_exec_query_noparams (db, q));
data = udb_query_get_user_data (q);
if (NULL == data) {
data = udb_query_get_user_data (q);
if (NULL == data) {
- data = malloc (sizeof (*data));
+ data = calloc (1, sizeof (*data));
if (NULL == data) {
log_err ("Out of memory.");
return -1;
}
if (NULL == data) {
log_err ("Out of memory.");
return -1;
}
- memset (data, 0, sizeof (*data));
data->params = NULL;
data->params_num = 0;
data->params = NULL;
data->params_num = 0;