svn commit: r1189237 - in /subversion/trunk/subversion: libsvn_client/list.c libsvn_ra/compat.c svn/log-cmd.c

[ju...@apache.org]

Author: julianfoad
Date: Wed Oct 26 14:29:50 2011
New Revision: 1189237

URL: http://svn.apache.org/viewvc?rev=1189237&view=rev
Log:
Simplify some sorted-hash iteration code.

* subversion/libsvn_client/list.c
  (get_dir_contents): Read the item's value from the iterator instead of
    looking it up in the hash table.

* subversion/libsvn_ra/compat.c
  (prev_log_path): Same.

* subversion/svn/log-cmd.c
  (log_entry_receiver): Same.

Modified:
    subversion/trunk/subversion/libsvn_client/list.c
    subversion/trunk/subversion/libsvn_ra/compat.c
    subversion/trunk/subversion/svn/log-cmd.c

Modified: subversion/trunk/subversion/libsvn_client/list.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/list.c?rev=1189237&r1=1189236&r2=1189237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/list.c (original)
+++ subversion/trunk/subversion/libsvn_client/list.c Wed Oct 26 14:29:50 2011
@@ -91,7 +91,7 @@ get_dir_contents(apr_uint32_t dirent_fie
     {
       svn_sort__item_t *item = &APR_ARRAY_IDX(array, i, svn_sort__item_t);
       const char *path;
-      svn_dirent_t *the_ent = apr_hash_get(tmpdirents, item->key, item->klen);
+      svn_dirent_t *the_ent = item->value;
       svn_lock_t *lock;
 
       svn_pool_clear(iterpool);

Modified: subversion/trunk/subversion/libsvn_ra/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/compat.c?rev=1189237&r1=1189236&r2=1189237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/compat.c (original)
+++ subversion/trunk/subversion/libsvn_ra/compat.c Wed Oct 26 14:29:50 2011
@@ -154,7 +154,7 @@ prev_log_path(const char **prev_path_p,
                  path, to the change's copyfrom path.  Otherwise, this
                  change isn't really interesting to us, and our search
                  continues. */
-              change = apr_hash_get(changed_paths, ch_path, len);
+              change = item.value;
               if (change->copyfrom_path)
                 {
                   if (action_p)

Modified: subversion/trunk/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1189237&r1=1189236&r2=1189237&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Wed Oct 26 14:29:50 2011
@@ -227,8 +227,7 @@ log_entry_receiver(void *baton,
           svn_sort__item_t *item = &(APR_ARRAY_IDX(sorted_paths, i,
                                                    svn_sort__item_t));
           const char *path = item->key;
-          svn_log_changed_path2_t *log_item
-            = apr_hash_get(log_entry->changed_paths2, item->key, item->klen);
+          svn_log_changed_path2_t *log_item = item->value;
           const char *copy_data = "";
 
           if (lb->ctx->cancel_func)