projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collectd-perl(5): Add the DERIVE and ABSOLUTE data source types.
[collectd.git]
/
src
/
oracle.c
diff --git
a/src/oracle.c
b/src/oracle.c
index
accaee3
..
78a09ff
100644
(file)
--- a/
src/oracle.c
+++ b/
src/oracle.c
@@
-294,7
+294,8
@@
static int o_config (oconfig_item_t *ci) /* {{{ */
{
oconfig_item_t *child = ci->children + i;
if (strcasecmp ("Query", child->key) == 0)
{
oconfig_item_t *child = ci->children + i;
if (strcasecmp ("Query", child->key) == 0)
- udb_query_create (&queries, &queries_num, child);
+ udb_query_create (&queries, &queries_num, child,
+ /* callback = */ NULL, /* legacy mode = */ 0);
else if (strcasecmp ("Database", child->key) == 0)
o_config_add_database (child);
else
else if (strcasecmp ("Database", child->key) == 0)
o_config_add_database (child);
else
@@
-496,7
+497,7
@@
static int o_read_database_query (o_database_t *db, /* {{{ */
for (i = 0; i < column_num; i++) /* {{{ */
{
char *column_name;
for (i = 0; i < column_num; i++) /* {{{ */
{
char *column_name;
-
size_t
column_name_length;
+
ub4
column_name_length;
OCIParam *oci_param;
oci_param = NULL;
OCIParam *oci_param;
oci_param = NULL;
@@
-532,8
+533,8
@@
static int o_read_database_query (o_database_t *db, /* {{{ */
column_names[i][column_name_length] = 0;
DEBUG ("oracle plugin: o_read_database_query: column_names[%zu] = %s; "
column_names[i][column_name_length] = 0;
DEBUG ("oracle plugin: o_read_database_query: column_names[%zu] = %s; "
- "column_name_length = %
zu
;",
- i, column_names[i], column_name_length);
+ "column_name_length = %
"PRIu32"
;",
+ i, column_names[i],
(uint32_t)
column_name_length);
status = OCIDefineByPos (oci_statement,
&oci_defines[i], oci_error, (ub4) (i + 1),
status = OCIDefineByPos (oci_statement,
&oci_defines[i], oci_error, (ub4) (i + 1),