Merge r1822931, r1827783 from trunk:

* modules/loggers/mod_logio.c (logio_pre_config): Remove pointless
  static in optional fn pointer variable declaration.

* modules/ssl/ssl_engine_vars.c (ssl_var_log_config_register):
  Likewise.

Fix a potential compiler warning about uninitialized variable.
PR 59821
Submitted by: jorton, jailletc36
Reviewed by: jailletc36, jorton, ylavic

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

diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
index 6d61d2e5d40320050780eeec5ea94352b6a31892..b609f7f270fadfcf78d3d0d70dcfd3d5f6887acd 100644 (file)
--- a/modules/loggers/mod_logio.c
+++ b/modules/loggers/mod_logio.c
@@ -189,7 +189,7 @@ static int logio_pre_conn(conn_rec *c, void *csd)
 
 static int logio_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp)
 {
-    static APR_OPTIONAL_FN_TYPE(ap_register_log_handler) *log_pfn_register;
+    APR_OPTIONAL_FN_TYPE(ap_register_log_handler) *log_pfn_register;
 
     log_pfn_register = APR_RETRIEVE_OPTIONAL_FN(ap_register_log_handler);
 

diff --git a/modules/ssl/ssl_engine_vars.c b/modules/ssl/ssl_engine_vars.c
index a28d4dd75181c3e086827adfc91ad0b9504d0b74..5724f188904ba1812344f511a7c07ae6e191d6ea 100644 (file)
--- a/modules/ssl/ssl_engine_vars.c
+++ b/modules/ssl/ssl_engine_vars.c
@@ -1195,7 +1195,7 @@ static const char *ssl_var_log_handler_x(request_rec *r, char *a);
  */
 void ssl_var_log_config_register(apr_pool_t *p)
 {
-    static APR_OPTIONAL_FN_TYPE(ap_register_log_handler) *log_pfn_register;
+    APR_OPTIONAL_FN_TYPE(ap_register_log_handler) *log_pfn_register;
 
     log_pfn_register = APR_RETRIEVE_OPTIONAL_FN(ap_register_log_handler);
 

diff --git a/server/util_mutex.c b/server/util_mutex.c
index 9605aa482ad514f088b03e37b76dfaf5fc7ecbd2..e9249f67d89fc07846ec19cac0326ac57972e5a6 100644 (file)
--- a/server/util_mutex.c
+++ b/server/util_mutex.c
@@ -505,7 +505,7 @@ AP_CORE_DECLARE(void) ap_dump_mutexes(apr_pool_t *p, server_rec *s, apr_file_t *
     for (idx = apr_hash_first(p, mxcfg_by_type); idx; idx = apr_hash_next(idx))
     {
         mutex_cfg_t *mxcfg;
-        const char *name, *mech;
+        const char *name, *mech = "<unknown>";
         const void *name_;
         const char *dir = "";
         apr_hash_this(idx, &name_, NULL, NULL);