Eliminate possible compiler warnings pointed out by Joe.

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

diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index fd9735fa321f176dd6c2b5b2b6ee6e57b5dae1ab..4ba80a654365e5c74d02f7edd38eae1debfa028f 100644 (file)
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -27,9 +27,9 @@
 #include "http_log.h"
 #include "apr_reslist.h"
 #include "apr_strings.h"
-
 #include "apr_dbd.h"
 #include "mod_dbd.h"
+
 extern module AP_MODULE_DECLARE_DATA dbd_module;
 
 /************ svr cfg: manage db connection pool ****************/
@@ -287,19 +287,19 @@ static apr_status_t dbd_setup(apr_pool_t *pool, server_rec *s)
         - open acquires a connection from the pool (opens one if necessary)
         - close releases it back in to the pool
 */
-
+#define arec ((ap_dbd_t*)rec)
 #if APR_HAS_THREADS
 ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)
 {
-    ap_dbd_t *rec = NULL;
+    void *rec = NULL;
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
-    apr_status_t rv;
+    apr_status_t rv = APR_SUCCESS;
     const char *errmsg;
 
     if (!svr->persist) {
         /* Return a once-only connection */
-        rv = dbd_construct((void**)&rec, svr, pool);
-        return (rv == APR_SUCCESS) ? rec : NULL;
+        rv = dbd_construct(&rec, svr, pool);
+        return (rv == APR_SUCCESS) ? arec : NULL;
     }
 
     if (!svr->dbpool) {
@@ -307,13 +307,13 @@ ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)
             return NULL;
         }
     }
-    if (apr_reslist_acquire(svr->dbpool, (void**)&rec) != APR_SUCCESS) {
+    if (apr_reslist_acquire(svr->dbpool, &rec) != APR_SUCCESS) {
         ap_log_perror(APLOG_MARK, APLOG_ERR, 0, pool,
                       "Failed to acquire DBD connection from pool!");
         return NULL;
     }
-    if (apr_dbd_check_conn(rec->driver, pool, rec->handle) != APR_SUCCESS) {
-        errmsg = apr_dbd_error(rec->driver, rec->handle, rv);
+    if (apr_dbd_check_conn(arec->driver, pool, arec->handle) != APR_SUCCESS) {
+        errmsg = apr_dbd_error(arec->driver, arec->handle, rv);
         if (!errmsg) {
             errmsg = "(unknown)";
         }
@@ -322,27 +322,27 @@ ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)
         apr_reslist_invalidate(svr->dbpool, rec);
         return NULL;
     }
-    return rec;
+    return arec;
 }
 #else
 ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)
 {
-    apr_status_t rv;
+    apr_status_t rv = APR_SUCCESS;
     const char *errmsg;
-    ap_dbd_t *rec = NULL;
+    void *rec = NULL;
     svr_cfg *svr = ap_get_module_config(s->module_config, &dbd_module);
 
     if (!svr->persist) {
         /* Return a once-only connection */
-        rv = dbd_construct((void**)&rec, svr, pool);
-        return (rv == APR_SUCCESS) ? rec : NULL;
+        rv = dbd_construct(&rec, svr, pool);
+        return (rv == APR_SUCCESS) ? arec : NULL;
     }
 
 /* since we're in nothread-land, we can mess with svr->conn with impunity */
 /* If we have a persistent connection and it's good, we'll use it */
     if (svr->conn) {
         if (apr_dbd_check_conn(svr->conn->driver, pool, svr->conn->handle) != 0){
-            errmsg = apr_dbd_error(rec->driver, rec->handle, rv);
+            errmsg = apr_dbd_error(arec->driver, arec->handle, rv);
             if (!errmsg) {
                 errmsg = "(unknown)";
             }
@@ -353,8 +353,8 @@ ap_dbd_t* ap_dbd_open(apr_pool_t *pool, server_rec *s)
     }
 /* We don't have a connection right now, so we'll open one */
     if (!svr->conn) {
-        rv = dbd_construct((void**)&rec, svr, pool);
-        svr->conn = (rv == APR_SUCCESS) ? rec : NULL;
+        rv = dbd_construct(&rec, svr, pool);
+        svr->conn = (rv == APR_SUCCESS) ? arec : NULL;
     }
     return svr->conn;
 }