svn commit: r922245 - /subversion/trunk/subversion/libsvn_subr/mergeinfo.c

[julianfoad]

Author: julianfoad
Date: Fri Mar 12 13:01:18 2010
New Revision: 922245

URL: http://svn.apache.org/viewvc?rev=922245&view=rev
Log:
Correct a pointer target type (no functional change) and simplify some code.

* subversion/libsvn_subr/mergeinfo.c
  (svn_mergeinfo__set_inheritance): Simplify a hash dereference.
  (svn_mergeinfo__remove_prefix_from_catalog): Correct a pointer target type.

Modified:
    subversion/trunk/subversion/libsvn_subr/mergeinfo.c

Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=922245&r1=922244&r2=922245&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Fri Mar 12 13:01:18 2010
@@ -848,10 +848,7 @@ svn_mergeinfo__set_inheritance(svn_merge
            hi;
            hi = apr_hash_next(hi))
         {
-          apr_array_header_t *rangelist;
-          const char *path = svn__apr_hash_index_key(hi);
-
-          rangelist = apr_hash_get(mergeinfo, path, APR_HASH_KEY_STRING);
+          apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
 
           if (rangelist)
             svn_rangelist__set_inheritance(rangelist, inheritable);
@@ -1627,7 +1624,7 @@ svn_mergeinfo__remove_prefix_from_catalo
     {
       const char *original_path = svn__apr_hash_index_key(hi);
       apr_ssize_t klen = svn__apr_hash_index_klen(hi);
-      svn_mergeinfo_t *value = svn__apr_hash_index_val(hi);
+      svn_mergeinfo_t value = svn__apr_hash_index_val(hi);
 
       SVN_ERR_ASSERT(klen >= prefix_len);
       SVN_ERR_ASSERT(strncmp(original_path, prefix, prefix_len) == 0);