Revert "Let INGgetisnull return an bool"

This reverts commit aaf7299b2d90878b2f5cf9ad28f6b0c5e5696422.

diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c
index 227464b0ee31c4bfdde2c0e0b876807be80d3c16..c222928991fda82805b5543cd4901b18e6bf8971 100644 (file)
--- a/bacula/src/cats/myingres.c
+++ b/bacula/src/cats/myingres.c
@@ -440,12 +440,12 @@ char *INGgetvalue(INGresult *res, int row_number, int column_number)
    }
    return res->act_row->sqlvar[column_number].sqldata;
 }
-bool INGgetisnull(INGresult *res, int row_number, int column_number)
+int INGgetisnull(INGresult *res, int row_number, int column_number)
 {
    if (row_number != res->act_row->row_number) {
       INGrowSeek(res, row_number);
    }
-   return (*res->act_row->sqlvar[column_number].sqlind == -1) ? true : false;
+   return (*res->act_row->sqlvar[column_number].sqlind == -1) ? 1 : 0;
 }
 int INGntuples(const INGresult *res)
 {

diff --git a/bacula/src/cats/myingres.h b/bacula/src/cats/myingres.h
index 45899b8c84fe6e56c4b6c55c683a3785c05d01e0..d867fc9a6b7622c3e24c1d1f8beb7e0a1ad1335a 100644 (file)
--- a/bacula/src/cats/myingres.h
+++ b/bacula/src/cats/myingres.h
@@ -73,7 +73,7 @@ typedef struct ing_conn {
 int INGcheck(void);
 short INGgetCols(B_DB *mdb, const char *stmt);
 char *INGgetvalue(INGresult *res, int row_number, int column_number);
-bool INGgetisnull(INGresult *res, int row_number, int column_number);
+int INGgetisnull(INGresult *res, int row_number, int column_number);
 int INGntuples(const INGresult *res);
 int INGnfields(const INGresult *res);
 char *INGfname(const INGresult *res, int column_number);

diff --git a/bacula/src/cats/myingres.sc b/bacula/src/cats/myingres.sc
index 2ea172a5a6d08c6bf68b776e53cbba8003f021b2..43dfc58de6857cdfb39deb0828ab2117f59ab8ad 100644 (file)
--- a/bacula/src/cats/myingres.sc
+++ b/bacula/src/cats/myingres.sc
@@ -467,13 +467,13 @@ char *INGgetvalue(INGresult *res, int row_number, int column_number)
    return res->act_row->sqlvar[column_number].sqldata;
 }
 
-bool INGgetisnull(INGresult *res, int row_number, int column_number)
+int INGgetisnull(INGresult *res, int row_number, int column_number)
 {
    if (row_number != res->act_row->row_number) {
       INGrowSeek(res, row_number);
    }
 
-   return (*res->act_row->sqlvar[column_number].sqlind == -1) ? true : false;
+   return (*res->act_row->sqlvar[column_number].sqlind == -1) ? 1 : 0;
 }
 
 int INGntuples(const INGresult *res)

diff --git a/bacula/src/cats/myingres.sh b/bacula/src/cats/myingres.sh
index f3a1a2da4a224f4c7772f916eb6a7ebb250744d3..f96b3409519b993282e9a60d67a7a8074dec5852 100644 (file)
--- a/bacula/src/cats/myingres.sh
+++ b/bacula/src/cats/myingres.sh
@@ -86,7 +86,7 @@ typedef struct ing_conn {
 int INGcheck(void);
 short INGgetCols(B_DB *mdb, const char *stmt);
 char *INGgetvalue(INGresult *res, int row_number, int column_number);
-bool INGgetisnull(INGresult *res, int row_number, int column_number);
+int INGgetisnull(INGresult *res, int row_number, int column_number);
 int INGntuples(const INGresult *res);
 int INGnfields(const INGresult *res);
 char *INGfname(const INGresult *res, int column_number);