Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 193C411646 for ; Mon, 4 Aug 2014 08:51:01 +0000 (UTC) Received: (qmail 22373 invoked by uid 500); 4 Aug 2014 08:51:00 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 22345 invoked by uid 500); 4 Aug 2014 08:51:00 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 22331 invoked by uid 99); 4 Aug 2014 08:51:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Aug 2014 08:51:00 +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; Mon, 04 Aug 2014 08:51:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AD5DD2388D2B; Mon, 4 Aug 2014 08:50:37 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1615506 - in /subversion/branches/authzperf/subversion: libsvn_repos/log.c libsvn_subr/string.c Date: Mon, 04 Aug 2014 08:50:37 -0000 To: commits@subversion.apache.org From: stefan2@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140804085037.AD5DD2388D2B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stefan2 Date: Mon Aug 4 08:50:36 2014 New Revision: 1615506 URL: http://svn.apache.org/r1615506 Log: On the authzperf branch: Fix compiler warnings. * subversion/libsvn_repos/log.c (detect_changed): Don't have a second iterpool. * subversion/libsvn_subr/string.c (svn_stringbuf_replace_all): Don't shadow the outer TO_COPY variable. Found by: brane Modified: subversion/branches/authzperf/subversion/libsvn_repos/log.c subversion/branches/authzperf/subversion/libsvn_subr/string.c Modified: subversion/branches/authzperf/subversion/libsvn_repos/log.c URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/libsvn_repos/log.c?rev=1615506&r1=1615505&r2=1615506&view=diff ============================================================================== --- subversion/branches/authzperf/subversion/libsvn_repos/log.c (original) +++ subversion/branches/authzperf/subversion/libsvn_repos/log.c Mon Aug 4 08:50:36 2014 @@ -385,7 +385,6 @@ detect_changed(apr_hash_t **changed, apr_array_header_t *sorted; int i; apr_pool_t *scratch_pool = svn_pool_create(pool); - apr_pool_t *iterpool = svn_pool_create(pool); sorted = svn_sort__hash(changes, svn_sort_compare_items_lexically, scratch_pool); Modified: subversion/branches/authzperf/subversion/libsvn_subr/string.c URL: http://svn.apache.org/viewvc/subversion/branches/authzperf/subversion/libsvn_subr/string.c?rev=1615506&r1=1615505&r2=1615506&view=diff ============================================================================== --- subversion/branches/authzperf/subversion/libsvn_subr/string.c (original) +++ subversion/branches/authzperf/subversion/libsvn_subr/string.c Mon Aug 4 08:50:36 2014 @@ -741,7 +741,7 @@ svn_stringbuf_replace_all(svn_stringbuf_ * separated by REPLACEMENT. */ for ( ; pos; pos = strstr(str->data + current, to_find), ++replacements) { - apr_size_t to_copy = pos - str->data - current; + to_copy = pos - str->data - current; svn_stringbuf_ensure(str, str->len + to_copy + replacement_len); if (to_copy)