Fix the warnings associated with the pre_config patch.

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

diff --git a/include/http_config.h b/include/http_config.h
index 4cf661d75193d9b70e27f07758e020c578ccf6c9..bbce765add67b39a290922b0a72e9c8a9df9fdb1 100644 (file)
--- a/include/http_config.h
+++ b/include/http_config.h
@@ -210,7 +210,7 @@ typedef struct module_struct {
                                  * It's mainly important for the DSO facility
                                  * (see also mod_so).
                                  */
-    void *(*pre_config) (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp, server_rec *s);
+    void (*pre_config) (ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp);
     void *(*create_dir_config) (ap_context_t *p, char *dir);
     void *(*merge_dir_config) (ap_context_t *p, void *base_conf, void *new_conf);
     void *(*create_server_config) (ap_context_t *p, server_rec *s);

diff --git a/server/config.c b/server/config.c
index 058f3d55cad0a5f0587b0c5b6fb97e19cf834ccf..b2692cea87eb287f94436f3e6ad16dd17164c191 100644 (file)
--- a/server/config.c
+++ b/server/config.c
@@ -1308,14 +1308,13 @@ void ap_single_module_configure(ap_context_t *p, server_rec *s, module *m)
                              (*m->create_dir_config)(p, NULL));
 }
 
-void run_pre_config(ap_context_t *p, ap_context_t *plog,
-                       ap_context_t *ptemp, server_rec *s)
+void run_pre_config(ap_context_t *p, ap_context_t *plog, ap_context_t *ptemp)
 {
     module *m;
 
     for (m = top_module; m; m = m->next)
         if (m->pre_config)
-            (*m->pre_config) (p, plog, ptemp, s);
+            (*m->pre_config) (p, plog, ptemp);
     init_handlers(p);
 }
 

diff --git a/server/main.c b/server/main.c
index 493a7c79c4d45446c34439ccd7359638f1543f2d..09659cf86ca7e03b9bd244c59012d7cda766b595 100644 (file)
--- a/server/main.c
+++ b/server/main.c
@@ -364,7 +364,7 @@ API_EXPORT_NONSTD(int)        main(int argc, char *argv[])
        for example, to settle down. */
 
     ap_server_root = def_server_root;
-    run_pre_config(pconf, plog, ptemp, server_conf);
+    run_pre_config(pconf, plog, ptemp);
     server_conf = ap_read_config(process, ptemp, confname);
     if (configtestonly) {
        ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, NULL, "Syntax OK\n");
@@ -383,7 +383,7 @@ API_EXPORT_NONSTD(int)        main(int argc, char *argv[])
        }
        ap_create_context(&ptemp, pconf);
        ap_server_root = def_server_root;
-       run_pre_config(pconf, plog, ptemp, server_conf);
+       run_pre_config(pconf, plog, ptemp);
        server_conf = ap_read_config(process, ptemp, confname);
        ap_clear_pool(plog);
        ap_run_open_logs(pconf, plog, ptemp, server_conf);