projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-5.4' into collectd-5.5
[collectd.git]
/
src
/
postgresql.c
diff --git
a/src/postgresql.c
b/src/postgresql.c
index
47c9c5c
..
23c4af3
100644
(file)
--- a/
src/postgresql.c
+++ b/
src/postgresql.c
@@
-772,7
+772,7
@@
static char *values_to_sqlarray (const data_set_t *ds, const value_list_t *vl,
if (ds->ds[i].type == DS_TYPE_GAUGE)
status = ssnprintf (str_ptr, str_len,
if (ds->ds[i].type == DS_TYPE_GAUGE)
status = ssnprintf (str_ptr, str_len,
- ",
%f"
, vl->values[i].gauge);
+ ",
"GAUGE_FORMAT
, vl->values[i].gauge);
else if (store_rates) {
if (rates == NULL)
rates = uc_get_rate (ds, vl);
else if (store_rates) {
if (rates == NULL)
rates = uc_get_rate (ds, vl);
@@
-1045,17
+1045,19
@@
static int config_query_param_add (udb_query_t *q, oconfig_item_t *ci)
data = udb_query_get_user_data (q);
if (NULL == data) {
data = udb_query_get_user_data (q);
if (NULL == data) {
- data =
(c_psql_user_data_t *) s
malloc (sizeof (*data));
+ data = malloc (sizeof (*data));
if (NULL == data) {
log_err ("Out of memory.");
return -1;
}
memset (data, 0, sizeof (*data));
data->params = NULL;
if (NULL == data) {
log_err ("Out of memory.");
return -1;
}
memset (data, 0, sizeof (*data));
data->params = NULL;
+ data->params_num = 0;
+
+ udb_query_set_user_data (q, data);
}
}
- tmp = (c_psql_param_t *) realloc (data->params,
- (data->params_num + 1) * sizeof (c_psql_param_t));
+ tmp = realloc (data->params, (data->params_num + 1) * sizeof (*data->params));
if (NULL == tmp) {
log_err ("Out of memory.");
return -1;
if (NULL == tmp) {
log_err ("Out of memory.");
return -1;
@@
-1079,8
+1081,6
@@
static int config_query_param_add (udb_query_t *q, oconfig_item_t *ci)
}
data->params_num++;
}
data->params_num++;
- udb_query_set_user_data (q, data);
-
return (0);
} /* config_query_param_add */
return (0);
} /* config_query_param_add */
@@
-1164,7
+1164,7
@@
static int c_psql_config_writer (oconfig_item_t *ci)
writers = tmp;
writer = writers + writers_num;
writers = tmp;
writer = writers + writers_num;
-
++writers_num
;
+
memset (writer, 0, sizeof (*writer))
;
writer->name = sstrdup (ci->values[0].value.string);
writer->statement = NULL;
writer->name = sstrdup (ci->values[0].value.string);
writer->statement = NULL;
@@
-1184,10
+1184,10
@@
static int c_psql_config_writer (oconfig_item_t *ci)
if (status != 0) {
sfree (writer->statement);
sfree (writer->name);
if (status != 0) {
sfree (writer->statement);
sfree (writer->name);
- sfree (writer);
return status;
}
return status;
}
+ ++writers_num;
return 0;
} /* c_psql_config_writer */
return 0;
} /* c_psql_config_writer */