commit fe362d445ce57ae56eb96ac931bc0f59d34650a4
author Bojan Smojver <bojan@apache.org> Fri Feb 13 05:03:10 2009 +0000
committer Bojan Smojver <bojan@apache.org> Fri Feb 13 05:03:10 2009 +0000
tree 220c428e13ac53611232213f057e81a6d3fde4f5
parent 88ce02b9101f5bfbef7b3492ecb2b82d7a208bed

Do not crash if process is NULL.
Do not print diagnostics to stderr (APU DBD operates silently).
Do not allow driver to exit the process (always return INT_CANCEL on error).

git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@743986 13f79535-47bb-0310-9956-ffa450edef68

dbd/apr_dbd_freetds.c

diff --git a/dbd/apr_dbd_freetds.c b/dbd/apr_dbd_freetds.c
index 61e2bb6..9a0cae7 100644
--- a/dbd/apr_dbd_freetds.c
+++ b/dbd/apr_dbd_freetds.c
@@ -606,9 +606,7 @@
 
     process = dbopen(login, server);
 
-    fprintf(stderr, "databaseName [%s]\n", databaseName);
-
-    if (databaseName != NULL)
+    if (process != NULL && databaseName != NULL)
     {
         dbuse(process, databaseName);
     }
@@ -691,6 +689,11 @@
     regfree(&dbd_freetds_find_arg);
     return APR_SUCCESS;
 }
+static int freetds_err_handler(DBPROCESS *dbproc, int severity, int dberr,
+                               int oserr, char *dberrstr, char *oserrstr)
+{
+    return INT_CANCEL; /* never exit */
+}
 static void dbd_freetds_init(apr_pool_t *pool)
 {
     int rv = regcomp(&dbd_freetds_find_arg,
@@ -701,6 +704,7 @@
         fprintf(stderr, "regcomp failed: %s\n", errmsg);
     }
     dbinit();
+    dberrhandle(freetds_err_handler);
     apr_pool_cleanup_register(pool, NULL, freetds_term, apr_pool_cleanup_null);
 }