remove some dead code

Stefan Fritsch · Stefan Fritsch · commit adb246e7a0da · 2011-12-18T17:25:40.000Z
found by clang statical analyzer git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1220462 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
@@ -251,7 +251,7 @@ static apr_status_t hm_file_update_stat(hm_ctx_t *ctx, hm_server_t *s, apr_pool_
     if (rv == APR_SUCCESS) {
         char *t;
         apr_table_t *hbt = apr_table_make(pool, 10);
-        apr_bucket_alloc_t *ba = apr_bucket_alloc_create(pool);
+        apr_bucket_alloc_t *ba;
         apr_bucket_brigade *bb;
         apr_bucket_brigade *tmpbb;
 
diff --git a/modules/lua/mod_lua.c b/modules/lua/mod_lua.c
@@ -1106,11 +1106,7 @@ static void *overlay_hook_specs(apr_pool_t *p,
 {
     const apr_array_header_t *overlay_info = (const apr_array_header_t*)overlay_val;
     const apr_array_header_t *base_info = (const apr_array_header_t*)base_val;
-    apr_array_header_t *newspecs  = apr_array_make(p, 2, 
-                                        sizeof(ap_lua_mapped_handler_spec *));
-
-    newspecs = apr_array_append(p, base_info, overlay_info);
-    return newspecs;
+    return apr_array_append(p, base_info, overlay_info);
 }
 
 static void *merge_dir_config(apr_pool_t *p, void *basev, void *overridesv)
@@ -1142,7 +1138,6 @@ static void *merge_dir_config(apr_pool_t *p, void *basev, void *overridesv)
     else { 
         a->package_paths = overrides->package_paths;
         a->package_cpaths = overrides->package_cpaths;
-        a->package_cpaths = overrides->package_cpaths;
         a->mapped_handlers= overrides->mapped_handlers;
         a->hooks= overrides->hooks;
     }

Original file line number	Diff line number	Diff line change
`@@ -1106,11 +1106,7 @@ static void overlay_hook_specs(apr_pool_t p,`
`1106`	`1106`	`{`
`1107`	`1107`	`const apr_array_header_t overlay_info = (const apr_array_header_t)overlay_val;`
`1108`	`1108`	`const apr_array_header_t base_info = (const apr_array_header_t)base_val;`
`1109`		`- apr_array_header_t *newspecs = apr_array_make(p, 2,`
`1110`		`- sizeof(ap_lua_mapped_handler_spec *));`
`1111`		`-`
`1112`		`- newspecs = apr_array_append(p, base_info, overlay_info);`
`1113`		`- return newspecs;`
	`1109`	`+ return apr_array_append(p, base_info, overlay_info);`
`1114`	`1110`	`}`
`1115`	`1111`
`1116`	`1112`	`static void merge_dir_config(apr_pool_t p, void basev, void overridesv)`
`@@ -1142,7 +1138,6 @@ static void merge_dir_config(apr_pool_t p, void basev, void overridesv)`
`1142`	`1138`	`else {`
`1143`	`1139`	`a->package_paths = overrides->package_paths;`
`1144`	`1140`	`a->package_cpaths = overrides->package_cpaths;`
`1145`		`- a->package_cpaths = overrides->package_cpaths;`
`1146`	`1141`	`a->mapped_handlers= overrides->mapped_handlers;`
`1147`	`1142`	`a->hooks= overrides->hooks;`
`1148`	`1143`	`}`