From a2ba35768ab227762580a7fc6cc34ce5043f6d38 Mon Sep 17 00:00:00 2001 From: Marco van Wieringen Date: Sat, 3 Apr 2010 23:02:23 +0200 Subject: [PATCH] Regenerated myingres.c from myingres.sc --- bacula/src/cats/myingres.c | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c index e393b2ea79..8800c60578 100644 --- a/bacula/src/cats/myingres.c +++ b/bacula/src/cats/myingres.c @@ -334,9 +334,9 @@ static inline int INGfetchAll(const char *query, INGresult *ing_res) /* # line 367 "myingres.sc" */ /* open */ { IIsqInit(&sqlca); - IIcsOpen((char *)"c2",10560,29663); + IIcsOpen((char *)"c2",11417,2807); IIwritio(0,(short *)0,1,32,0,(char *)"s2"); - IIcsQuery((char *)"c2",10560,29663); + IIcsQuery((char *)"c2",11417,2807); } /* # line 368 "myingres.sc" */ /* host code */ if ((check = INGcheck()) < 0) { @@ -347,7 +347,7 @@ static inline int INGfetchAll(const char *query, INGresult *ing_res) /* # line 374 "myingres.sc" */ /* fetch */ { IIsqInit(&sqlca); - if (IIcsRetScroll((char *)"c2",10560,29663,-1,-1) != 0) { + if (IIcsRetScroll((char *)"c2",11417,2807,-1,-1) != 0) { IIcsDaGet(0,desc); IIcsERetrieve(); } /* IIcsRetrieve */ @@ -372,7 +372,7 @@ static inline int INGfetchAll(const char *query, INGresult *ing_res) /* # line 394 "myingres.sc" */ /* close */ { IIsqInit(&sqlca); - IIcsClose((char *)"c2",10560,29663); + IIcsClose((char *)"c2",11417,2807); } /* # line 396 "myingres.sc" */ /* host code */ ing_res->status = ING_COMMAND_OK; @@ -568,15 +568,19 @@ INGconn *INGconnectDB(char *dbname, char *user, char *passwd) } void INGdisconnectDB(INGconn *dbconn) { - /* - * TODO: check for any real use of dbconn: maybe whenn multithreaded? - */ -/* # line 597 "myingres.sc" */ /* disconnect */ +/* # line 594 "myingres.sc" */ + + int sess_id; +/* # line 596 "myingres.sc" */ + + sess_id = dbconn->session_id; +/* # line 600 "myingres.sc" */ /* disconnect */ { IIsqInit(&sqlca); + IILQsidSessID(sess_id); IIsqDisconnect(); } -/* # line 598 "myingres.sc" */ /* host code */ +/* # line 602 "myingres.sc" */ /* host code */ if (dbconn != NULL) { free(dbconn->msg); free(dbconn); @@ -584,16 +588,16 @@ void INGdisconnectDB(INGconn *dbconn) } char *INGerrorMessage(const INGconn *conn) { -/* # line 606 "myingres.sc" */ +/* # line 610 "myingres.sc" */ char errbuf[256]; -/* # line 608 "myingres.sc" */ +/* # line 612 "myingres.sc" */ -/* # line 610 "myingres.sc" */ /* inquire_ingres */ +/* # line 614 "myingres.sc" */ /* inquire_ingres */ { IILQisInqSqlio((short *)0,1,32,255,errbuf,63); } -/* # line 611 "myingres.sc" */ /* host code */ +/* # line 615 "myingres.sc" */ /* host code */ memcpy(conn->msg, &errbuf, 256); return conn->msg; } @@ -605,5 +609,5 @@ char *INGcmdTuples(INGresult *res) int INGputCopyEnd(INGconn *conn, const char *errormsg); int INGputCopyData(INGconn *conn, const char *buffer, int nbytes); */ -/* # line 625 "myingres.sc" */ +/* # line 629 "myingres.sc" */ #endif -- 2.39.5