Merge r1661486 from trunk:

core.c: Fix warnings about unused variables

Reviewed by: rjung, jailletc36

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

diff --git a/STATUS b/STATUS
index a66c1b604be07d40010ad18b5aed15602502e3cc..0e08dfd5e50322d97150c844d5669532efe8e5c7 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -115,11 +115,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: http://people.apache.org/~ylavic/httpd-r1632742-x-w.diff is the
              same patch without space changes (may be easier to review).
 
-  *) core.c: Fix warnings about unused variables
-     trunk patch: http://svn.apache.org/r1661486
-     2.4.x patch: trunk works
-     +1: trawick, rjung, jailletc36
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/server/core.c b/server/core.c
index 1ef958098c3ff4cc3371ba66c0a7764fe4a6aa7f..4c7976e1ad4272ef148e027dbf525563c670f0e9 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -198,7 +198,6 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
     core_dir_config *base = (core_dir_config *)basev;
     core_dir_config *new = (core_dir_config *)newv;
     core_dir_config *conf;
-    int i;
 
     /* Create this conf by duplicating the base, replacing elements
      * (or creating copies for merging) where new-> values exist.
@@ -789,7 +788,6 @@ char *ap_response_code_string(request_rec *r, int error_index)
     core_request_config *reqconf = ap_get_core_module_config(r->request_config);
     const char *err;
     const char *response;
-    void *val;
     ap_expr_info_t *expr;
 
     /* check for string registered via ap_custom_response() first */