summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-12-18 18:25:40 +0100
committerStefan Fritsch <sf@apache.org>2011-12-18 18:25:40 +0100
commitb9dacea0ea2e3cada1b96c0d85a919dcb6d64d4e (patch)
tree58bcaa1273d2102f3d367124af464cf69199852a
parentmod_firehose: Ensure directives are defined global only. (diff)
downloadapache2-b9dacea0ea2e3cada1b96c0d85a919dcb6d64d4e.tar.xz
apache2-b9dacea0ea2e3cada1b96c0d85a919dcb6d64d4e.zip
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
-rw-r--r--modules/cluster/mod_heartmonitor.c2
-rw-r--r--modules/lua/mod_lua.c7
2 files changed, 2 insertions, 7 deletions
diff --git a/modules/cluster/mod_heartmonitor.c b/modules/cluster/mod_heartmonitor.c
index b72e196a89..527bc38e11 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 de4aceeb40..128dde1bc6 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;
}