From: Guenter Knauf <fuankg@apache.org>
Date: Mon, 28 Sep 2009 00:24:56 +0000 (+0000)
Subject: mod_dbd: Backport of r708820 from trunk to avoid compiler warnings
X-Git-Tag: 2.2.15~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=705fb835e2dbf291331446fd1d21e077a3640e8c;p=thirdparty%2Fapache%2Fhttpd.git

mod_dbd: Backport of r708820 from trunk to avoid compiler warnings
with strict compilers like Sun Studio. Reported on the list by Jie Gao.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@819429 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index a9a34def353..6ee44f2232e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.15
 
+  *) mod_dbd: Backport of r708820 from trunk to avoid compiler warnings with
+     strict compilers like Sun Studio. Reported on the list by Jie Gao.
+     [Guenter Knauf]
+
   *) mod_mime: Detect invalid use of MultiviewsMatch inside Location and
      LocationMatch sections.  PR47754. [Dan Poirier]
 
diff --git a/STATUS b/STATUS
index fcf6f782d07..7507e0f1be5 100644
--- a/STATUS
+++ b/STATUS
@@ -87,12 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
- * mod_dbd: Backport r708820 from trunk to avoid compiler warnings with
-   strict compilers like Sun Studio.  Mentioned on the list by Jie Gao.
-   Trunk Patch: http://svn.apache.org/viewvc?view=rev&revision=708820
-   2.2.x Patch: trunk patch works with offset -6 / -9 lines.
-   +1: fuankg, trawick, rpluem
-
  * mod_ssl: Backport of r819373 from trunk; fix wrong 3rd parameter passed
    to to apr_brigade_split_line().  Mentioned on the list by Jie Gao.
    Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=819373
diff --git a/modules/database/mod_dbd.c b/modules/database/mod_dbd.c
index 9914875caf1..cb01193f92d 100644
--- a/modules/database/mod_dbd.c
+++ b/modules/database/mod_dbd.c
@@ -641,6 +641,15 @@ static apr_status_t dbd_setup_init(apr_pool_t *pool, server_rec *s)
     return rv;
 }
 
+static void dbd_child_init(apr_pool_t *p, server_rec *s)
+{
+  apr_status_t rv = dbd_setup_init(p, s);
+  if (rv) {
+    ap_log_error(APLOG_MARK, APLOG_CRIT, rv, s,
+                 "DBD: child init failed!");
+  }
+}
+
 #if APR_HAS_THREADS
 static apr_status_t dbd_setup_lock(server_rec *s, dbd_group_t *group)
 {
@@ -895,7 +904,7 @@ static void dbd_hooks(apr_pool_t *pool)
 {
     ap_hook_pre_config(dbd_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_post_config(dbd_post_config, NULL, NULL, APR_HOOK_MIDDLE);
-    ap_hook_child_init((void*)dbd_setup_init, NULL, NULL, APR_HOOK_MIDDLE);
+    ap_hook_child_init(dbd_child_init, NULL, NULL, APR_HOOK_MIDDLE);
 
     APR_REGISTER_OPTIONAL_FN(ap_dbd_prepare);
     APR_REGISTER_OPTIONAL_FN(ap_dbd_open);