From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 10 Apr 2010 10:16:39 +0000 (+0200)
Subject: Revert "Fix typos"
X-Git-Tag: Release-5.0.2~60
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=72edee54159d7267ff626dc9f7c4d3b707c5cb8b;p=bacula%2Fbacula

Revert "Fix typos"

This reverts commit d2833a5f89205838d397cdc7b2dd4d73b5c2a6fd.
---

diff --git a/bacula/src/cats/ingres.c b/bacula/src/cats/ingres.c
index c8799a7cfd..7a483d5fec 100755
--- a/bacula/src/cats/ingres.c
+++ b/bacula/src/cats/ingres.c
@@ -658,7 +658,7 @@ int my_ingres_currval(B_DB *mdb, const char *table_name)
 
    Dmsg1(500, "my_ingres_currval invoked with '%s'\n", query);
 
-   result = INGquery(mdb->db, query, mdb->transaction);
+   result = INGquery(mdb->db, query);
 
    if (!result) {
       Dmsg1(50, "Query failed: %s\n", query);
diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c
index c072446534..728a0668d8 100644
--- a/bacula/src/cats/myingres.c
+++ b/bacula/src/cats/myingres.c
@@ -547,7 +547,7 @@ INGresult *INGquery(INGconn *conn, const char *query, bool transaction)
    IISQLDA *desc = NULL;
    INGresult *res = NULL;
    int rows = -1;
-   int cols = INGgetCols(conn, query, transaction);
+   int cols = INGgetCols(conn, query);
 /* # line 546 "myingres.sc" */	
   
   int sess_id;
@@ -607,7 +607,7 @@ void INGclear(INGresult *res)
    INGfreeDescriptor(res->sqlda);
    INGfreeINGresult(res);
 }
-void INGcommit(const INGconn *dbconn)
+void INGcommit(onst INGconn *conn)
 {
 /* # line 601 "myingres.sc" */	
   
diff --git a/bacula/src/cats/myingres.h b/bacula/src/cats/myingres.h
index f5a4554275..e89315ec0a 100644
--- a/bacula/src/cats/myingres.h
+++ b/bacula/src/cats/myingres.h
@@ -70,17 +70,17 @@ typedef struct ing_conn {
 } INGconn;
 /* ---Prototypes--- */
 int INGcheck(void);
-short INGgetCols(INGconn *conn, const char *query, bool transaction);
+short INGgetCols(INGconn *conn, const char *query. bool transaction);
 char *INGgetvalue(INGresult *res, int row_number, int column_number);
 bool 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);
 short INGftype(const INGresult *res, int column_number);
-int INGexec(INGconn *db, const char *query, bool transaction);
-INGresult *INGquery(INGconn *db, const char *query, bool transaction);
+int INGexec(INGconn *db, const char *query. bool transaction);
+INGresult *INGquery(INGconn *db, const char *query. bool transaction);
 void INGclear(INGresult *res);
-void INGcommit(const INGconn *conn);
+void INGcommit(onst INGconn *conn);
 INGconn *INGconnectDB(char *dbname, char *user, char *passwd, int session_id);
 void INGdisconnectDB(INGconn *dbconn);
 char *INGerrorMessage(const INGconn *conn);
diff --git a/bacula/src/cats/myingres.sc b/bacula/src/cats/myingres.sc
index 7e664af097..5f0b210851 100644
--- a/bacula/src/cats/myingres.sc
+++ b/bacula/src/cats/myingres.sc
@@ -542,7 +542,7 @@ INGresult *INGquery(INGconn *conn, const char *query, bool transaction)
    IISQLDA *desc = NULL;
    INGresult *res = NULL;
    int rows = -1;
-   int cols = INGgetCols(conn, query, transaction);
+   int cols = INGgetCols(conn, query);
    EXEC SQL BEGIN DECLARE SECTION;
    int sess_id;
    EXEC SQL END DECLARE SECTION;
@@ -596,7 +596,7 @@ void INGclear(INGresult *res)
    INGfreeINGresult(res);
 }
 
-void INGcommit(const INGconn *conn)
+void INGcommit(onst INGconn *conn)
 {
    EXEC SQL BEGIN DECLARE SECTION;
    int sess_id;
diff --git a/bacula/src/cats/myingres.sh b/bacula/src/cats/myingres.sh
index 11629707b0..cb554a47e9 100644
--- a/bacula/src/cats/myingres.sh
+++ b/bacula/src/cats/myingres.sh
@@ -83,17 +83,17 @@ typedef struct ing_conn {
 
 /* ---Prototypes--- */
 int INGcheck(void);
-short INGgetCols(INGconn *conn, const char *query, bool transaction);
+short INGgetCols(INGconn *conn, const char *query. bool transaction);
 char *INGgetvalue(INGresult *res, int row_number, int column_number);
 bool 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);
 short INGftype(const INGresult *res, int column_number);
-int INGexec(INGconn *db, const char *query, bool transaction);
-INGresult *INGquery(INGconn *db, const char *query, bool transaction);
+int INGexec(INGconn *db, const char *query. bool transaction);
+INGresult *INGquery(INGconn *db, const char *query. bool transaction);
 void INGclear(INGresult *res);
-void INGcommit(const INGconn *conn);
+void INGcommit(onst INGconn *conn);
 INGconn *INGconnectDB(char *dbname, char *user, char *passwd, int session_id);
 void INGdisconnectDB(INGconn *dbconn);
 char *INGerrorMessage(const INGconn *conn);