MonetDB: odbc-tls - Send ODBC errors to stdout

[Joeri van Ruth via checkin-list]

Changeset: b083c5775dfe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b083c5775dfe
Modified Files:
        clients/odbc/samples/odbcconnect.c
Branch: odbc-tls
Log Message:

Send ODBC errors to stdout

'odbcconnect' is intended to test odbc calls. If they fail, that's
regular output that the user or test script want to see in the
context of the other output.

Command line errors still go to stderr.


diffs (43 lines):

diff --git a/clients/odbc/samples/odbcconnect.c 
b/clients/odbc/samples/odbcconnect.c
--- a/clients/odbc/samples/odbcconnect.c
+++ b/clients/odbc/samples/odbcconnect.c
@@ -112,7 +112,7 @@ main(int argc, char **argv)
        for (int i = 0; i < ntargets; i++) {
                SQLCHAR *t = targets[i];
                if (verbose)
-                       fprintf(stderr, "\nTarget: %s\n", t);
+                       printf("\nTarget: %s\n", t);
                outbuf[0] = '\0';
                int ret = action(t);
                if (ret)
@@ -135,7 +135,7 @@ ensure_ok(SQLSMALLINT type, SQLHANDLE ha
                case SQL_SUCCESS:
                case SQL_NEED_DATA:
                        if (verbose)
-                               fprintf(stderr, "Succeeded: %s\n", message);
+                               printf("Succeeded: %s\n", message);
                        class = "Info";
                        break;
                case SQL_SUCCESS_WITH_INFO:
@@ -145,7 +145,7 @@ ensure_ok(SQLSMALLINT type, SQLHANDLE ha
                        class = "Error";
                        break;
                default:
-                       fprintf(stderr, "Internal error: %s: unknown SQLRETURN 
%d", message, ret);
+                       printf("Internal error: %s: unknown SQLRETURN %d", 
message, ret);
                        break;
        }
 
@@ -161,10 +161,10 @@ ensure_ok(SQLSMALLINT type, SQLHANDLE ha
                if (!SQL_SUCCEEDED(diag_ret))
                        break;
                if (class) {
-                       fprintf(stderr, "%s: %s\n", class, message);
+                       printf("%s: %s\n", class, message);
                        class = NULL;
                }
-               fprintf(stderr, "    - %s: %s\n", state, explanation);
+               printf("    - %s: %s\n", state, explanation);
        }
 
        if (!SQL_SUCCEEDED(ret) && ret != SQL_NEED_DATA) {
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org