httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r708820 - /httpd/httpd/trunk/modules/database/mod_dbd.c
Date Wed, 29 Oct 2008 08:10:21 GMT
Author: pquerna
Date: Wed Oct 29 01:10:21 2008
New Revision: 708820

URL: http://svn.apache.org/viewvc?rev=708820&view=rev
Log:
* modules/database/mod_dbd.c
  (dbd_child_init): New function, wrapper around dbd_setup_init.
  (dbd_hooks): Call dbd_child_init instead of casting dbd_setup_init.

Modified:
    httpd/httpd/trunk/modules/database/mod_dbd.c

Modified: httpd/httpd/trunk/modules/database/mod_dbd.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/database/mod_dbd.c?rev=708820&r1=708819&r2=708820&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/database/mod_dbd.c (original)
+++ httpd/httpd/trunk/modules/database/mod_dbd.c Wed Oct 29 01:10:21 2008
@@ -647,6 +647,15 @@
     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)
 {
@@ -904,7 +913,7 @@
 {
     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);



Mime
View raw message