From: Stefan Fritsch Date: Sun, 18 Dec 2011 17:25:40 +0000 (+0000) Subject: remove some dead code X-Git-Tag: 2.5.0-alpha~7660 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9dacea0ea2e3cada1b96c0d85a919dcb6d64d4e;p=thirdparty%2Fapache%2Fhttpd.git remove some dead code 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 index b72e196a895..527bc38e110 100644 --- 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 index de4aceeb40e..128dde1bc60 100644 --- 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; }