From: Stefan Reddig Date: Fri, 6 Nov 2009 20:42:05 +0000 (+0100) Subject: Add commit from Stefan Reddig X-Git-Tag: Release-7.0.0~2414 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d985976386e992326c792ab4e5346ae51fc59484;p=bacula%2Fbacula Add commit from Stefan Reddig --- diff --git a/bacula/src/cats/myingres.c b/bacula/src/cats/myingres.c index fcfa3fa515..17e5ffc9bb 100644 --- a/bacula/src/cats/myingres.c +++ b/bacula/src/cats/myingres.c @@ -1,24 +1,26 @@ + #include "bacula.h" #include "cats.h" #ifdef HAVE_INGRES -# include "/opt/Ingres/IngresII/ingres/files/eqdefc.h" -# include "/opt/Ingres/IngresII/ingres/files/eqsqlca.h" - extern IISQLCA sqlca; /* SQL Communications Area */ -# include "/opt/Ingres/IngresII/ingres/files/eqsqlda.h" -#include -#include -#include +#include " +# include +extern IISQLCA sqlca; /* SQL Communications Area */ +#include + + + #include "myingres.h" #define INGRES_DEBUG 0 #define DEBB(x) if (INGRES_DEBUG >= x) { #define DEBE } + /* ---Implementations--- */ int INGcheck() { char errbuf[256]; - if (sqlca.sqlcode < 0) + if (sqlca.sqlcode < 0) { /* # line 23 "myingres.sc" */ /* inquire_ingres */ { @@ -27,8 +29,8 @@ int INGcheck() /* # line 24 "myingres.sc" */ /* host code */ printf("Ingres-DBMS-Fehler: %s\n", errbuf); return sqlca.sqlcode; - } - else + } + else return 0; } short INGgetCols(const char *stmt) @@ -228,7 +230,6 @@ void INGfreeRowSpace(ING_ROW *row, IISQLDA *sqlda) int i; if (row == NULL || sqlda == NULL) { - printf("INGfreeRowSpace: one argument is NULL!\n"); return; } for ( i = 0 ; i < sqlda->sqld ; ++i )