From: Florian Forster <octo@huhu.verplant.org>
Date: Sun, 9 Nov 2008 10:21:25 +0000 (+0100)
Subject: dbi plugin: Replace `dbi_conn_error_flag' with `dbi_conn_error'
X-Git-Tag: collectd-4.6.0~158
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=845886a4f028ca82e054be0536e5a7863d915352;p=collectd.git

dbi plugin: Replace `dbi_conn_error_flag' with `dbi_conn_error'

Version 0.8 of the libdbi deprecates `dbi_conn_error_flag', so use the other
function.
---

diff --git a/src/dbi.c b/src/dbi.c
index 484c604c..e1dd1bc6 100644
--- a/src/dbi.c
+++ b/src/dbi.c
@@ -168,7 +168,7 @@ static int cdbi_result_get_field (dbi_result res, /* {{{ */
   }
 
   connection = dbi_result_get_conn (res);
-  if (dbi_conn_error_flag (connection) != 0)
+  if (dbi_conn_error (connection, NULL) != 0)
   {
     char errbuf[1024];
     ERROR ("dbi plugin: cdbi_result_get: dbi_result_get_*_idx failed: %s.",
@@ -800,7 +800,7 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
       const char *inst;
 
       inst = dbi_result_get_string (res, q->instances[i]);
-      if (dbi_conn_error_flag (db->connection) != 0)
+      if (dbi_conn_error (db->connection, NULL) != 0)
       {
         char errbuf[1024];
         ERROR ("dbi plugin: cdbi_read_database_query (%s, %s): "
@@ -844,7 +844,7 @@ static int cdbi_read_database_query (cdbi_database_t *db, /* {{{ */
     status = dbi_result_next_row (res);
     if (status != 1)
     {
-      if (dbi_conn_error_flag (db->connection) != 0)
+      if (dbi_conn_error (db->connection, NULL) != 0)
       {
         char errbuf[1024];
         WARNING ("dbi plugin: cdbi_read_database_query (%s, %s): "