Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 185A59600 for ; Sun, 18 Dec 2011 17:58:51 +0000 (UTC) Received: (qmail 48208 invoked by uid 500); 18 Dec 2011 17:58:50 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 48162 invoked by uid 500); 18 Dec 2011 17:58:50 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 48155 invoked by uid 99); 18 Dec 2011 17:58:50 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2011 17:58:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 18 Dec 2011 17:58:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 6CF9F2388AC8; Sun, 18 Dec 2011 17:58:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1220507 - in /httpd/httpd/branches/2.4.x: ./ modules/cluster/mod_heartmonitor.c modules/lua/mod_lua.c Date: Sun, 18 Dec 2011 17:58:26 -0000 To: cvs@httpd.apache.org From: sf@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111218175826.6CF9F2388AC8@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sf Date: Sun Dec 18 17:58:25 2011 New Revision: 1220507 URL: http://svn.apache.org/viewvc?rev=1220507&view=rev Log: Merge r1220462: remove some dead code found by clang statical analyzer Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Dec 18 17:58:25 2011 @@ -1,3 +1,3 @@ /httpd/httpd/branches/revert-ap-ldap:1150158-1150173 /httpd/httpd/branches/wombat-integration:723609-723841 -/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015 +/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462 Modified: httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c?rev=1220507&r1=1220506&r2=1220507&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c (original) +++ httpd/httpd/branches/2.4.x/modules/cluster/mod_heartmonitor.c Sun Dec 18 17:58:25 2011 @@ -251,7 +251,7 @@ static apr_status_t hm_file_update_stat( 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; Modified: httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c?rev=1220507&r1=1220506&r2=1220507&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c (original) +++ httpd/httpd/branches/2.4.x/modules/lua/mod_lua.c Sun Dec 18 17:58:25 2011 @@ -1106,11 +1106,7 @@ static void *overlay_hook_specs(apr_pool { 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 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; }