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 90CF318A8D for ; Tue, 15 Sep 2015 16:11:32 +0000 (UTC) Received: (qmail 32480 invoked by uid 500); 15 Sep 2015 16:11:32 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 32448 invoked by uid 500); 15 Sep 2015 16:11:32 -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 32438 invoked by uid 99); 15 Sep 2015 16:11:32 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Sep 2015 16:11:32 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 45408AC0111 for ; Tue, 15 Sep 2015 16:11:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1703242 - /subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Date: Tue, 15 Sep 2015 16:11:32 -0000 To: commits@subversion.apache.org From: stsp@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150915161132.45408AC0111@hades.apache.org> Author: stsp Date: Tue Sep 15 16:11:31 2015 New Revision: 1703242 URL: http://svn.apache.org/r1703242 Log: * subversion/libsvn_subr/cache-membuffer.c (prefix_pool_get_internal): Rename local variable 'index' to 'idx'. Fixes another shadowed symbol warning (index() is an old synonym for strchr()). Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Modified: subversion/trunk/subversion/libsvn_subr/cache-membuffer.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-membuffer.c?rev=1703242&r1=1703241&r2=1703242&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/cache-membuffer.c (original) +++ subversion/trunk/subversion/libsvn_subr/cache-membuffer.c Tue Sep 15 16:11:31 2015 @@ -339,9 +339,9 @@ prefix_pool_get_internal(apr_uint32_t *p value = apr_hash_get(prefix_pool->map, prefix, prefix_len); if (value != NULL) { - const apr_size_t index = value - prefix_pool->values; - SVN_ERR_ASSERT(index < prefix_pool->values_used); - *prefix_idx = (apr_uint32_t) index; + const apr_size_t idx = value - prefix_pool->values; + SVN_ERR_ASSERT(idx < prefix_pool->values_used); + *prefix_idx = (apr_uint32_t) idx; return SVN_NO_ERROR; }