You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/09/15 18:11:32 UTC

svn commit: r1703242 - /subversion/trunk/subversion/libsvn_subr/cache-membuffer.c

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;
     }