Commit a986919e authored by Jim Jagielski's avatar Jim Jagielski
Browse files

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
parent f514203c

modules/loggers/mod_logio.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

modules/ssl/ssl_engine_vars.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

server/util_mutex.c

+1 −1
Original line number Diff line number Diff line
@@ -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);