X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Foracle.c;h=78a09ffd048962a05b5054bf51756a88463f37bc;hb=e81c851023c889ecbfacf2d2c9c02afd7dc4596f;hp=accaee35045d815f9e1b29b19694a4bf6a9a7c82;hpb=4c9b0f6dd36455ad853af1b5b2b1a63f6964cbfd;p=collectd.git diff --git a/src/oracle.c b/src/oracle.c index accaee35..78a09ffd 100644 --- 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) - 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 @@ -496,7 +497,7 @@ static int o_read_database_query (o_database_t *db, /* {{{ */ 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; @@ -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_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),