X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fdbi.c;h=f37d04c9add7911eb7ccdff64aa653f3db70e5b3;hb=e95a52352cd3f10fc7db1f3dd4bef06a28e2d780;hp=5f8520f335bdc7b11b7cfa04b29a2661a4defc6a;hpb=7b0628b4f4688d48d89f94ca381ca6340da05b37;p=collectd.git

diff --git a/src/dbi.c b/src/dbi.c
index 5f8520f3..f37d04c9 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -83,12 +83,12 @@ typedef struct cdbi_database_s cdbi_database_t; /* }}} */
  * Global variables
  */
 #if !defined(HAVE_LEGACY_LIBDBI) || !HAVE_LEGACY_LIBDBI
-static dbi_inst dbi_instance = 0;
+static dbi_inst dbi_instance;
 #endif
-static udb_query_t **queries = NULL;
-static size_t queries_num = 0;
-static cdbi_database_t **databases = NULL;
-static size_t databases_num = 0;
+static udb_query_t **queries;
+static size_t queries_num;
+static cdbi_database_t **databases;
+static size_t databases_num;
 
 static int cdbi_read_database(user_data_t *ud);
 
@@ -407,7 +407,7 @@ static int cdbi_config(oconfig_item_t *ci) /* {{{ */
 
 static int cdbi_init(void) /* {{{ */
 {
-  static int did_init = 0;
+  static int did_init;
   int status;
 
   if (did_init != 0)
@@ -547,12 +547,18 @@ static int cdbi_read_database_query(cdbi_database_t *db, /* {{{ */
     sstrncpy(column_names[i], column_name, DATA_MAX_NAME_LEN);
   } /* }}} for (i = 0; i < column_num; i++) */
 
-  udb_query_prepare_result(
+  status = udb_query_prepare_result(
       q, prep_area, (db->host ? db->host : hostname_g),
       /* plugin = */ (db->plugin_name != NULL) ? db->plugin_name : "dbi",
       db->name, column_names, column_num,
       /* interval = */ (db->interval > 0) ? db->interval : 0);
 
+  if (status != 0)
+  {
+    ERROR("dbi plugin: udb_query_prepare_result failed with status %i.", status);
+    BAIL_OUT (-1);
+  }
+
   /* 0 = error; 1 = success; */
   status = dbi_result_first_row(res); /* {{{ */
   if (status != 1) {