Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c Wed Jul 30 11:23:49 2014 @@ -1636,7 +1636,7 @@ svn_fs_lock_many(svn_fs_t *fs, /* Enforce that the token be an XML-safe URI. */ for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { - const svn_fs_lock_target_t *target = svn__apr_hash_index_val(hi); + const svn_fs_lock_target_t *target = apr_hash_this_val(hi); err = SVN_NO_ERROR; if (target->token) @@ -1670,12 +1670,12 @@ svn_fs_lock_many(svn_fs_t *fs, if (err) { if (!cb_err && lock_callback) - cb_err = lock_callback(lock_baton, svn__apr_hash_index_key(hi), + cb_err = lock_callback(lock_baton, apr_hash_this_key(hi), NULL, err, scratch_pool); svn_error_clear(err); } else - svn_hash_sets(ok_targets, svn__apr_hash_index_key(hi), target); + svn_hash_sets(ok_targets, apr_hash_this_key(hi), target); } if (!apr_hash_count(ok_targets))
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_base/lock.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_base/lock.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_base/lock.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_base/lock.c Wed Jul 30 11:23:49 2014 @@ -247,8 +247,8 @@ svn_fs_base__lock(svn_fs_t *fs, for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { struct lock_args args; - const char *path = svn__apr_hash_index_key(hi); - const svn_fs_lock_target_t *target = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const svn_fs_lock_target_t *target = apr_hash_this_val(hi); svn_lock_t *lock; svn_error_t *err; @@ -362,8 +362,8 @@ svn_fs_base__unlock(svn_fs_t *fs, for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { struct unlock_args args; - const char *path = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); svn_error_t *err; args.path = svn_fs__canonicalize_abspath(path, result_pool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_base/tree.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_base/tree.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_base/tree.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_base/tree.c Wed Jul 30 11:23:49 2014 @@ -1615,7 +1615,7 @@ base_dir_optimal_order(apr_array_header_ apr_array_header_t *result = apr_array_make(pool, apr_hash_count(entries), sizeof(svn_fs_dirent_t *)); for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) - APR_ARRAY_PUSH(result, svn_fs_dirent_t *) = svn__apr_hash_index_val(hi); + APR_ARRAY_PUSH(result, svn_fs_dirent_t *) = apr_hash_this_val(hi); *ordered_p = result; return SVN_NO_ERROR; Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c Wed Jul 30 11:23:49 2014 @@ -2418,8 +2418,7 @@ read_dir_entries(apr_array_header_t *ent { apr_hash_index_t *hi; for (hi = apr_hash_first(iterpool, hash); hi; hi = apr_hash_next(hi)) - APR_ARRAY_PUSH(entries, svn_fs_dirent_t *) - = svn__apr_hash_index_val(hi); + APR_ARRAY_PUSH(entries, svn_fs_dirent_t *) = apr_hash_this_val(hi); } if (!sorted(entries)) Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c Wed Jul 30 11:23:49 2014 @@ -210,8 +210,8 @@ write_digest_file(apr_hash_t *children, for (hi = apr_hash_first(pool, children); hi; hi = apr_hash_next(hi)) { svn_stringbuf_appendbytes(children_list, - svn__apr_hash_index_key(hi), - svn__apr_hash_index_klen(hi)); + apr_hash_this_key(hi), + apr_hash_this_key_len(hi)); svn_stringbuf_appendbyte(children_list, '\n'); } hash_store(hash, CHILDREN_KEY, sizeof(CHILDREN_KEY)-1, @@ -609,7 +609,7 @@ walk_digest_files(const char *fs_path, subpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, children); hi; hi = apr_hash_next(hi)) { - const char *digest = svn__apr_hash_index_key(hi); + const char *digest = apr_hash_this_key(hi); svn_pool_clear(subpool); SVN_ERR(walk_digest_files (fs_path, digest_path_from_digest(fs_path, digest, subpool), @@ -1223,8 +1223,8 @@ svn_fs_fs__lock(svn_fs_t *fs, one, choosing one with a token if possible. */ for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - const svn_fs_lock_target_t *target = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const svn_fs_lock_target_t *target = apr_hash_this_val(hi); const svn_fs_lock_target_t *other; path = svn_fspath__canonicalize(path, result_pool); @@ -1313,8 +1313,8 @@ svn_fs_fs__unlock(svn_fs_t *fs, for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); const char *other; path = svn_fspath__canonicalize(path, result_pool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c Wed Jul 30 11:23:49 2014 @@ -220,7 +220,7 @@ recover_find_max_ids(svn_fs_t *fs, const svn_fs_fs__id_part_t *rev_item; apr_uint64_t node_id, copy_id; apr_off_t child_dir_offset; - const svn_string_t *path = svn__apr_hash_index_val(hi); + const svn_string_t *path = apr_hash_this_val(hi); svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/temp_serializer.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/temp_serializer.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/temp_serializer.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/temp_serializer.c Wed Jul 30 11:23:49 2014 @@ -597,8 +597,8 @@ svn_fs_fs__serialize_properties(void **d /* populate it with the hash entries */ for (hi = apr_hash_first(pool, hash), i=0; hi; hi = apr_hash_next(hi), ++i) { - properties.keys[i] = svn__apr_hash_index_key(hi); - properties.values[i] = svn__apr_hash_index_val(hi); + properties.keys[i] = apr_hash_this_key(hi); + properties.values[i] = apr_hash_this_val(hi); } /* serialize it */ @@ -1268,7 +1268,7 @@ svn_fs_fs__serialize_mergeinfo(void **da i = 0; for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - svn_rangelist_t *ranges = svn__apr_hash_index_val(hi); + svn_rangelist_t *ranges = apr_hash_this_val(hi); for (k = 0; k < ranges->nelts; ++k, ++i) merges.ranges[i] = *APR_ARRAY_IDX(ranges, k, svn_merge_range_t*); } Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c Wed Jul 30 11:23:49 2014 @@ -3223,7 +3223,7 @@ verify_locks(svn_fs_t *fs, for (hi = apr_hash_first(pool, changed_paths); hi; hi = apr_hash_next(hi)) { APR_ARRAY_PUSH(changed_paths_sorted, const char *) = - svn__apr_hash_index_key(hi); + apr_hash_this_key(hi); } svn_sort__array(changed_paths_sorted, svn_sort_compare_paths); @@ -3416,7 +3416,7 @@ upgrade_transaction(svn_fs_t *fs, Other IDs (noderevs and their usage in directories) will only be assigned later anyways. */ - name = svn__apr_hash_index_key(hi); + name = apr_hash_this_key(hi); if (!is_noderev_file(name)) continue; @@ -3897,8 +3897,8 @@ svn_fs_fs__list_transactions(apr_array_h /* Loop through all the entries and return anything that ends with '.txn'. */ for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - apr_ssize_t klen = svn__apr_hash_index_klen(hi); + const char *name = apr_hash_this_key(hi); + apr_ssize_t klen = apr_hash_this_key_len(hi); const char *id; /* The name must end with ".txn" to be considered a transaction. */ Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_util/fs-util.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_util/fs-util.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_util/fs-util.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_util/fs-util.c Wed Jul 30 11:23:49 2014 @@ -214,8 +214,8 @@ svn_fs__append_to_merged_froms(svn_merge *output = apr_hash_make(pool); for (hi = apr_hash_first(pool, input); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); svn_hash_sets(*output, svn_fspath__join(path, rel_path, pool), Propchange: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/ ------------------------------------------------------------------------------ Merged /subversion/trunk/subversion/libsvn_fs_x:r1614347-1614615 Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/cached_data.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_x/cached_data.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_x/cached_data.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_x/cached_data.c Wed Jul 30 11:23:49 2014 @@ -2440,8 +2440,7 @@ read_dir_entries(apr_array_header_t *ent { apr_hash_index_t *hi; for (hi = apr_hash_first(iterpool, hash); hi; hi = apr_hash_next(hi)) - APR_ARRAY_PUSH(entries, svn_fs_dirent_t *) - = svn__apr_hash_index_val(hi); + APR_ARRAY_PUSH(entries, svn_fs_dirent_t *) = apr_hash_this_val(hi); } if (!sorted(entries)) Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/lock.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_x/lock.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_x/lock.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_x/lock.c Wed Jul 30 11:23:49 2014 @@ -210,8 +210,8 @@ write_digest_file(apr_hash_t *children, for (hi = apr_hash_first(pool, children); hi; hi = apr_hash_next(hi)) { svn_stringbuf_appendbytes(children_list, - svn__apr_hash_index_key(hi), - svn__apr_hash_index_klen(hi)); + apr_hash_this_key(hi), + apr_hash_this_key_len(hi)); svn_stringbuf_appendbyte(children_list, '\n'); } hash_store(hash, CHILDREN_KEY, sizeof(CHILDREN_KEY)-1, @@ -609,7 +609,7 @@ walk_digest_files(const char *fs_path, subpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, children); hi; hi = apr_hash_next(hi)) { - const char *digest = svn__apr_hash_index_key(hi); + const char *digest = apr_hash_this_key(hi); svn_pool_clear(subpool); SVN_ERR(walk_digest_files (fs_path, digest_path_from_digest(fs_path, digest, subpool), @@ -1223,8 +1223,8 @@ svn_fs_x__lock(svn_fs_t *fs, one, choosing one with a token if possible. */ for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - const svn_fs_lock_target_t *target = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const svn_fs_lock_target_t *target = apr_hash_this_val(hi); const svn_fs_lock_target_t *other; path = svn_fspath__canonicalize(path, result_pool); @@ -1313,8 +1313,8 @@ svn_fs_x__unlock(svn_fs_t *fs, for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); const char *other; path = svn_fspath__canonicalize(path, result_pool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/temp_serializer.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_x/temp_serializer.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_x/temp_serializer.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_x/temp_serializer.c Wed Jul 30 11:23:49 2014 @@ -588,8 +588,8 @@ svn_fs_x__serialize_properties(void **da /* populate it with the hash entries */ for (hi = apr_hash_first(pool, hash), i=0; hi; hi = apr_hash_next(hi), ++i) { - properties.keys[i] = svn__apr_hash_index_key(hi); - properties.values[i] = svn__apr_hash_index_val(hi); + properties.keys[i] = apr_hash_this_key(hi); + properties.values[i] = apr_hash_this_val(hi); } /* serialize it */ @@ -1266,7 +1266,7 @@ svn_fs_x__serialize_mergeinfo(void **dat i = 0; for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - svn_rangelist_t *ranges = svn__apr_hash_index_val(hi); + svn_rangelist_t *ranges = apr_hash_this_val(hi); for (k = 0; k < ranges->nelts; ++k, ++i) merges.ranges[i] = *APR_ARRAY_IDX(ranges, k, svn_merge_range_t*); } Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_x/transaction.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_x/transaction.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_fs_x/transaction.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_fs_x/transaction.c Wed Jul 30 11:23:49 2014 @@ -3084,7 +3084,7 @@ verify_locks(svn_fs_t *fs, changed_paths = apr_array_make(pool, apr_hash_count(changes) + 1, sizeof(const char *)); for (hi = apr_hash_first(pool, changes); hi; hi = apr_hash_next(hi)) - APR_ARRAY_PUSH(changed_paths, const char *) = svn__apr_hash_index_key(hi); + APR_ARRAY_PUSH(changed_paths, const char *) = apr_hash_this_key(hi); svn_sort__array(changed_paths, svn_sort_compare_paths); /* Now, traverse the array of changed paths, verify locks. Note @@ -3455,8 +3455,8 @@ svn_fs_x__list_transactions(apr_array_he /* Loop through all the entries and return anything that ends with '.txn'. */ for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - apr_ssize_t klen = svn__apr_hash_index_klen(hi); + const char *name = apr_hash_this_key(hi); + apr_ssize_t klen = apr_hash_this_key_len(hi); const char *id; /* The name must end with ".txn" to be considered a transaction. */ Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/compat.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/compat.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra/compat.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra/compat.c Wed Jul 30 11:23:49 2014 @@ -922,9 +922,9 @@ svn_ra__get_inherited_props_walk(svn_ra_ hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - apr_ssize_t klen = svn__apr_hash_index_klen(hi); - svn_string_t *value = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + apr_ssize_t klen = apr_hash_this_key_len(hi); + svn_string_t *value = apr_hash_this_val(hi); if (svn_property_kind2(name) == svn_prop_regular_kind) { Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Wed Jul 30 11:23:49 2014 @@ -1208,7 +1208,7 @@ svn_error_t *svn_ra_lock(svn_ra_session_ for (hi = apr_hash_first(pool, path_revs); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); SVN_ERR_ASSERT(svn_relpath_is_canonical(path)); } @@ -1233,7 +1233,7 @@ svn_error_t *svn_ra_unlock(svn_ra_sessio for (hi = apr_hash_first(pool, path_tokens); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); SVN_ERR_ASSERT(svn_relpath_is_canonical(path)); } Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c Wed Jul 30 11:23:49 2014 @@ -416,8 +416,8 @@ deltify_etc(const svn_commit_info_t *com for (hi = apr_hash_first(subpool, deb->lock_tokens); hi; hi = apr_hash_next(hi)) { - const void *relpath = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const void *relpath = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); const char *fspath; fspath = svn_fspath__join(deb->fspath_base, relpath, subpool); @@ -475,8 +475,8 @@ apply_lock_tokens(svn_fs_t *fs, for (hi = apr_hash_first(scratch_pool, lock_tokens); hi; hi = apr_hash_next(hi)) { - const void *relpath = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const void *relpath = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); const char *fspath; /* The path needs to live as long as ACCESS_CTX. */ @@ -1424,9 +1424,8 @@ svn_ra_local__lock(svn_ra_session_t *ses for (hi = apr_hash_first(pool, path_revs); hi; hi = apr_hash_next(hi)) { const char *abs_path = svn_fspath__join(sess->fs_path->data, - svn__apr_hash_index_key(hi), - pool); - svn_revnum_t current_rev = *(svn_revnum_t *)svn__apr_hash_index_val(hi); + apr_hash_this_key(hi), pool); + svn_revnum_t current_rev = *(svn_revnum_t *)apr_hash_this_val(hi); svn_fs_lock_target_t *target = svn_fs_lock_target_create(NULL, current_rev, pool); @@ -1475,9 +1474,8 @@ svn_ra_local__unlock(svn_ra_session_t *s for (hi = apr_hash_first(pool, path_tokens); hi; hi = apr_hash_next(hi)) { const char *abs_path = svn_fspath__join(sess->fs_path->data, - svn__apr_hash_index_key(hi), - pool); - const char *token = svn__apr_hash_index_val(hi); + apr_hash_this_key(hi), pool); + const char *token = apr_hash_this_val(hi); svn_hash_sets(targets, abs_path, token); } Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c Wed Jul 30 11:23:49 2014 @@ -1057,7 +1057,7 @@ setup_if_header_recursive(svn_boolean_t hi; hi = apr_hash_next(hi)) { - const char *relpath = svn__apr_hash_index_key(hi); + const char *relpath = apr_hash_this_key(hi); apr_uri_t uri; if (!svn_relpath_skip_ancestor(rq_relpath, relpath)) @@ -1087,7 +1087,7 @@ setup_if_header_recursive(svn_boolean_t svn_stringbuf_appendbyte(sb, '<'); svn_stringbuf_appendcstr(sb, apr_uri_unparse(iterpool, &uri, 0)); svn_stringbuf_appendcstr(sb, "> (<"); - svn_stringbuf_appendcstr(sb, svn__apr_hash_index_val(hi)); + svn_stringbuf_appendcstr(sb, apr_hash_this_val(hi)); svn_stringbuf_appendcstr(sb, ">)"); } @@ -1465,8 +1465,8 @@ open_root(void *edit_baton, hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - svn_string_t *value = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_string_t *value = apr_hash_this_val(hi); const char *ns; if (strncmp(name, SVN_PROP_PREFIX, sizeof(SVN_PROP_PREFIX) - 1) == 0) Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/inherited_props.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/inherited_props.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/inherited_props.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/inherited_props.c Wed Jul 30 11:23:49 2014 @@ -240,7 +240,7 @@ keep_only_regular_props(apr_hash_t *prop for (hi = apr_hash_first(scratch_pool, props); hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); if (svn_property_kind2(propname) != svn_prop_regular_kind) svn_hash_sets(props, propname, NULL); Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/lock.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/lock.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/lock.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/lock.c Wed Jul 30 11:23:49 2014 @@ -455,8 +455,8 @@ svn_ra_serf__lock(svn_ra_session_t *ra_s lock_ctx = apr_pcalloc(scratch_pool, sizeof(*lock_ctx)); lock_ctx->pool = lock_pool; - lock_ctx->path = svn__apr_hash_index_key(hi); - lock_ctx->revision = *((svn_revnum_t*)svn__apr_hash_index_val(hi)); + lock_ctx->path = apr_hash_this_key(hi); + lock_ctx->revision = *((svn_revnum_t*)apr_hash_this_val(hi)); lock_ctx->lock = svn_lock_create(lock_pool); lock_ctx->lock->path = lock_ctx->path; lock_ctx->lock->comment = comment; @@ -564,8 +564,8 @@ svn_ra_serf__unlock(svn_ra_session_t *ra svn_pool_clear(iterpool); - path = svn__apr_hash_index_key(hi); - token = svn__apr_hash_index_val(hi); + path = apr_hash_this_key(hi); + token = apr_hash_this_val(hi); if (token && token[0]) continue; @@ -625,8 +625,8 @@ svn_ra_serf__unlock(svn_ra_session_t *ra lock_ctx->pool = lock_pool; - lock_ctx->path = svn__apr_hash_index_key(hi); - token = svn__apr_hash_index_val(hi); + lock_ctx->path = apr_hash_this_key(hi); + token = apr_hash_this_val(hi); lock_ctx->force = force; lock_ctx->token = apr_pstrcat(lock_pool, "<", token, ">", SVN_VA_NULL); Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c Wed Jul 30 11:23:49 2014 @@ -849,7 +849,7 @@ maybe_close_dir(dir_baton_t *dir) hi = apr_hash_next(hi)) { SVN_ERR(ctx->editor->change_file_prop(dir->dir_baton, - svn__apr_hash_index_key(hi), + apr_hash_this_key(hi), NULL /* value */, scratch_pool)); } @@ -1013,7 +1013,7 @@ close_file(file_baton_t *file, hi = apr_hash_next(hi)) { SVN_ERR(ctx->editor->change_file_prop(file->file_baton, - svn__apr_hash_index_key(hi), + apr_hash_this_key(hi), NULL /* value */, scratch_pool)); } Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c Wed Jul 30 11:23:49 2014 @@ -1235,8 +1235,8 @@ parse_iproplist(apr_array_header_t **inh hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - svn_string_t *value = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_string_t *value = apr_hash_this_val(hi); svn_hash_sets(new_iprop->prop_hash, apr_pstrdup(result_pool, name), svn_string_dup(value, result_pool)); Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/delta.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/delta.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/delta.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/delta.c Wed Jul 30 11:23:49 2014 @@ -875,9 +875,9 @@ delta_dirs(struct context *c, from the target tree. */ for (hi = apr_hash_first(pool, t_entries); hi; hi = apr_hash_next(hi)) { - const void *key = svn__apr_hash_index_key(hi); - apr_ssize_t klen = svn__apr_hash_index_klen(hi); - const svn_fs_dirent_t *t_entry = svn__apr_hash_index_val(hi); + const void *key = apr_hash_this_key(hi); + apr_ssize_t klen = apr_hash_this_key_len(hi); + const svn_fs_dirent_t *t_entry = apr_hash_this_val(hi); const svn_fs_dirent_t *s_entry; const char *t_fullpath; const char *e_fullpath; @@ -961,7 +961,7 @@ delta_dirs(struct context *c, { for (hi = apr_hash_first(pool, s_entries); hi; hi = apr_hash_next(hi)) { - const svn_fs_dirent_t *s_entry = svn__apr_hash_index_val(hi); + const svn_fs_dirent_t *s_entry = apr_hash_this_val(hi); const char *e_fullpath; svn_node_kind_t src_kind; Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/fs-wrap.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/fs-wrap.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/fs-wrap.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/fs-wrap.c Wed Jul 30 11:23:49 2014 @@ -74,7 +74,7 @@ svn_repos_fs_commit_txn(const char **con iterpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); + const char *key = apr_hash_this_key(hi); svn_pool_clear(iterpool); @@ -94,8 +94,8 @@ svn_repos_fs_commit_txn(const char **con iterpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - svn_string_t *val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + svn_string_t *val = apr_hash_this_val(hi); svn_pool_clear(iterpool); @@ -581,7 +581,7 @@ svn_repos_fs_lock_many(svn_repos_t *repo { const char *new_token; svn_fs_lock_target_t *target; - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); svn_pool_clear(iterpool); @@ -596,7 +596,7 @@ svn_repos_fs_lock_many(svn_repos_t *repo continue; } - target = svn__apr_hash_index_val(hi); + target = apr_hash_this_val(hi); if (*new_token) svn_fs_lock_target_set_token(target, new_token); svn_hash_sets(pre_targets, path, target); @@ -738,8 +738,8 @@ svn_repos_fs_unlock_many(svn_repos_t *re svn_fs_unlock_many() from happening for that path. */ for (hi = apr_hash_first(scratch_pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/hooks.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/hooks.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/hooks.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/hooks.c Wed Jul 30 11:23:49 2014 @@ -184,8 +184,8 @@ env_from_env_hash(apr_hash_t *env_hash, for (hi = apr_hash_first(scratch_pool, env_hash); hi; hi = apr_hash_next(hi)) { *envp = apr_psprintf(result_pool, "%s=%s", - (const char *)svn__apr_hash_index_key(hi), - (const char *)svn__apr_hash_index_val(hi)); + (const char *)apr_hash_this_key(hi), + (const char *)apr_hash_this_val(hi)); envp++; } *envp = NULL; @@ -519,8 +519,8 @@ lock_token_content(apr_file_t **handle, for (hi = apr_hash_first(pool, lock_tokens); hi; hi = apr_hash_next(hi)) { - const char *token = svn__apr_hash_index_key(hi); - const char *path = svn__apr_hash_index_val(hi); + const char *token = apr_hash_this_key(hi); + const char *path = apr_hash_this_val(hi); svn_stringbuf_appendstr(lock_str, svn_stringbuf_createf(pool, "%s|%s\n", Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/load-fs-vtable.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/load-fs-vtable.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/load-fs-vtable.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/load-fs-vtable.c Wed Jul 30 11:23:49 2014 @@ -209,8 +209,8 @@ prefix_mergeinfo_paths(svn_string_t **me prefixed_mergeinfo = apr_hash_make(pool); for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *merge_source = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *merge_source = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); const char *path; merge_source = svn_relpath_canonicalize(merge_source, pool); @@ -269,8 +269,8 @@ renumber_mergeinfo_revs(svn_string_t **f for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *merge_source = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *merge_source = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); struct parse_baton *pb = rb->pb; int i; @@ -831,7 +831,7 @@ remove_node_props(void *baton) for (hi = apr_hash_first(nb->pool, proplist); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); + const char *key = apr_hash_this_key(hi); SVN_ERR(change_node_prop(rb->txn_root, nb->path, key, NULL, rb->pb->validate_props, nb->pool)); Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/log.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/log.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/log.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/log.c Wed Jul 30 11:23:49 2014 @@ -82,8 +82,8 @@ svn_repos_check_revision_access(svn_repo subpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, changes); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - svn_fs_path_change2_t *change = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + svn_fs_path_change2_t *change = apr_hash_this_val(hi); svn_boolean_t readable; svn_pool_clear(subpool); @@ -217,9 +217,9 @@ detect_changed(apr_hash_t **changed, /* NOTE: Much of this loop is going to look quite similar to svn_repos_check_revision_access(), but we have to do more things here, so we'll live with the duplication. */ - const char *path = svn__apr_hash_index_key(hi); - apr_ssize_t path_len = svn__apr_hash_index_klen(hi); - svn_fs_path_change2_t *change = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + apr_ssize_t path_len = apr_hash_this_key_len(hi); + svn_fs_path_change2_t *change = apr_hash_this_val(hi); char action; svn_log_changed_path2_t *item; @@ -614,7 +614,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal hi; hi = apr_hash_next(hi)) { - svn_fs_path_change2_t *change = svn__apr_hash_index_val(hi); + svn_fs_path_change2_t *change = apr_hash_this_val(hi); /* If there was a prop change and we are not positive that _no_ mergeinfo change happened, we must assume that it might have. */ @@ -646,7 +646,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal hi = apr_hash_next(hi)) { const char *changed_path; - svn_fs_path_change2_t *change = svn__apr_hash_index_val(hi); + svn_fs_path_change2_t *change = apr_hash_this_val(hi); const char *base_path = NULL; svn_revnum_t base_rev = SVN_INVALID_REVNUM; svn_fs_root_t *base_root = NULL; @@ -663,7 +663,7 @@ fs_mergeinfo_changed(svn_mergeinfo_catal continue; /* Begin actual processing */ - changed_path = svn__apr_hash_index_key(hi); + changed_path = apr_hash_this_key(hi); svn_pool_clear(iterpool); switch (change->change_kind) @@ -1022,9 +1022,9 @@ get_combined_mergeinfo_changes(svn_merge for (hi = apr_hash_first(scratch_pool, added_mergeinfo_catalog); hi; hi = apr_hash_next(hi)) { - const char *changed_path = svn__apr_hash_index_key(hi); - apr_ssize_t klen = svn__apr_hash_index_klen(hi); - svn_mergeinfo_t added = svn__apr_hash_index_val(hi); + const char *changed_path = apr_hash_this_key(hi); + apr_ssize_t klen = apr_hash_this_key_len(hi); + svn_mergeinfo_t added = apr_hash_this_val(hi); svn_mergeinfo_t deleted; for (i = 0; i < paths->nelts; i++) @@ -1252,7 +1252,7 @@ send_log(svn_revnum_t rev, hi = apr_hash_next(hi)) { svn_boolean_t path_is_in_history = FALSE; - const char *changed_path = svn__apr_hash_index_key(hi); + const char *changed_path = apr_hash_this_key(hi); apr_hash_index_t *hi2; /* Look at each path on the log target's mergeinfo. */ @@ -1261,8 +1261,8 @@ send_log(svn_revnum_t rev, hi2; hi2 = apr_hash_next(hi2)) { - const char *mergeinfo_path = svn__apr_hash_index_key(hi2); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi2); + const char *mergeinfo_path = apr_hash_this_key(hi2); + svn_rangelist_t *rangelist = apr_hash_this_val(hi2); /* Check whether CHANGED_PATH at revision REV is a child of a (path, revision) tuple in LOG_TARGET_HISTORY_AS_MERGEINFO. */ @@ -1535,8 +1535,8 @@ combine_mergeinfo_path_lists(apr_array_h int i; struct rangelist_path *rp = apr_palloc(subpool, sizeof(*rp)); - rp->path = svn__apr_hash_index_key(hi); - rp->rangelist = svn__apr_hash_index_val(hi); + rp->path = apr_hash_this_key(hi); + rp->rangelist = apr_hash_this_val(hi); APR_ARRAY_PUSH(rangelist_paths, struct rangelist_path *) = rp; /* We need to make local copies of the rangelist, since we will be Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c Wed Jul 30 11:23:49 2014 @@ -184,8 +184,8 @@ add_subdir(svn_fs_root_t *source_root, for (phi = apr_hash_first(pool, props); phi; phi = apr_hash_next(phi)) { - const char *key = svn__apr_hash_index_key(phi); - svn_string_t *val = svn__apr_hash_index_val(phi); + const char *key = apr_hash_this_key(phi); + svn_string_t *val = apr_hash_this_val(phi); svn_pool_clear(subpool); SVN_ERR(editor->change_dir_prop(*dir_baton, key, val, subpool)); @@ -200,7 +200,7 @@ add_subdir(svn_fs_root_t *source_root, { svn_fs_path_change2_t *change; svn_boolean_t readable = TRUE; - svn_fs_dirent_t *dent = svn__apr_hash_index_val(hi); + svn_fs_dirent_t *dent = apr_hash_this_val(hi); const char *copyfrom_path = NULL; svn_revnum_t copyfrom_rev = SVN_INVALID_REVNUM; const char *new_edit_path; @@ -303,8 +303,8 @@ add_subdir(svn_fs_root_t *source_root, for (phi = apr_hash_first(pool, props); phi; phi = apr_hash_next(phi)) { - const char *key = svn__apr_hash_index_key(phi); - svn_string_t *val = svn__apr_hash_index_val(phi); + const char *key = apr_hash_this_key(phi); + svn_string_t *val = apr_hash_this_val(phi); SVN_ERR(editor->change_file_prop(file_baton, key, val, subpool)); } @@ -877,9 +877,9 @@ svn_repos_replay2(svn_fs_root_t *root, changed_paths = apr_hash_make(pool); for (hi = apr_hash_first(pool, fs_changes); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - apr_ssize_t keylen = svn__apr_hash_index_klen(hi); - svn_fs_path_change2_t *change = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + apr_ssize_t keylen = apr_hash_this_key_len(hi); + svn_fs_path_change2_t *change = apr_hash_this_val(hi); svn_boolean_t allowed = TRUE; if (authz_read_func) @@ -1052,7 +1052,7 @@ add_subdir_ev2(svn_fs_root_t *source_roo { svn_fs_path_change2_t *change; svn_boolean_t readable = TRUE; - svn_fs_dirent_t *dent = svn__apr_hash_index_val(hi); + svn_fs_dirent_t *dent = apr_hash_this_val(hi); const char *copyfrom_path = NULL; svn_revnum_t copyfrom_rev = SVN_INVALID_REVNUM; const char *child_relpath; @@ -1503,9 +1503,9 @@ svn_repos__replay_ev2(svn_fs_root_t *roo for (hi = apr_hash_first(scratch_pool, fs_changes); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - apr_ssize_t keylen = svn__apr_hash_index_klen(hi); - svn_fs_path_change2_t *change = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + apr_ssize_t keylen = apr_hash_this_key_len(hi); + svn_fs_path_change2_t *change = apr_hash_this_val(hi); svn_boolean_t allowed = TRUE; if (authz_read_func) Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/reporter.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/reporter.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/reporter.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/reporter.c Wed Jul 30 11:23:49 2014 @@ -603,8 +603,8 @@ delta_proplists(report_baton_t *b, svn_r /* So source, i.e. all new. Transmit all target props. */ for (hi = apr_hash_first(pool, t_props); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - svn_string_t *val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + svn_string_t *val = apr_hash_this_val(hi); SVN_ERR(change_fn(b, object, key, val, pool)); } @@ -1246,7 +1246,7 @@ delta_dirs(report_baton_t *b, svn_revnum hi; hi = apr_hash_next(hi)) { - const svn_fs_dirent_t *s_entry = svn__apr_hash_index_val(hi); + const svn_fs_dirent_t *s_entry = apr_hash_this_val(hi); svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c Wed Jul 30 11:23:49 2014 @@ -1253,8 +1253,8 @@ find_merged_revisions(apr_array_header_t for (hi = apr_hash_first(iterpool, old_pr->merged_mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); apr_pool_t *iterpool3; int j; Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/config_auth.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/config_auth.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/config_auth.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/config_auth.c Wed Jul 30 11:23:49 2014 @@ -208,7 +208,7 @@ svn_config_walk_auth_data(const char *co itempool = svn_pool_create(iterpool); for (hi = apr_hash_first(iterpool, nodes); hi; hi = apr_hash_next(hi)) { - svn_io_dirent2_t *dirent = svn__apr_hash_index_val(hi); + svn_io_dirent2_t *dirent = apr_hash_this_val(hi); svn_stream_t *stream; apr_hash_t *creds_hash; const svn_string_t *realm; @@ -222,7 +222,7 @@ svn_config_walk_auth_data(const char *co svn_pool_clear(itempool); - item_path = svn_dirent_join(dir_path, svn__apr_hash_index_key(hi), + item_path = svn_dirent_join(dir_path, apr_hash_this_key(hi), itempool); err = svn_stream_open_readonly(&stream, item_path, Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/debug.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/debug.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/debug.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/debug.c Wed Jul 30 11:23:49 2014 @@ -145,8 +145,8 @@ svn_dbg__print_props(apr_hash_t *props, for (hi = apr_hash_first(apr_hash_pool_get(props), props); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - svn_string_t *val = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_string_t *val = apr_hash_this_val(hi); svn_dbg__printf(" '%s' -> '%s'\n", name, val->data); } Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c Wed Jul 30 11:23:49 2014 @@ -535,7 +535,7 @@ svn_hash_keys(apr_array_header_t **array for (hi = apr_hash_first(pool, hash); hi; hi = apr_hash_next(hi)) { - APR_ARRAY_PUSH(*array, const char *) = svn__apr_hash_index_key(hi); + APR_ARRAY_PUSH(*array, const char *) = apr_hash_this_key(hi); } return SVN_NO_ERROR; Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c Wed Jul 30 11:23:49 2014 @@ -2558,8 +2558,8 @@ svn_io_remove_dir2(const char *path, svn for (hi = apr_hash_first(subpool, dirents); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - const svn_io_dirent2_t *dirent = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + const svn_io_dirent2_t *dirent = apr_hash_this_val(hi); const char *fullpath; fullpath = svn_dirent_join(path, name, subpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/iter.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/iter.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/iter.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/iter.c Wed Jul 30 11:23:49 2014 @@ -184,45 +184,28 @@ svn_iter__break(void) return &internal_break_error; } -/* Note about the type casts: apr_hash_this() does not expect a const hash - * index pointer even though it does not modify the hash index. In - * Subversion we're trying to be const-correct, so these functions all take - * a const hash index and we cast away the const when passing it down to - * APR. (A compiler may warn about casting away 'const', but at least this - * cast is explicit and gathered in one place.) */ - -const void *svn__apr_hash_index_key(const apr_hash_index_t *hi) +#if !APR_VERSION_AT_LEAST(1, 5, 0) +const void *apr_hash_this_key(apr_hash_index_t *hi) { -#if APR_VERSION_AT_LEAST(1, 5, 0) - return apr_hash_this_key((apr_hash_index_t *)hi); -#else const void *key; apr_hash_this((apr_hash_index_t *)hi, &key, NULL, NULL); return key; -#endif } -apr_ssize_t svn__apr_hash_index_klen(const apr_hash_index_t *hi) +apr_ssize_t apr_hash_this_key_len(apr_hash_index_t *hi) { -#if APR_VERSION_AT_LEAST(1, 5, 0) - return apr_hash_this_key_len((apr_hash_index_t *)hi); -#else apr_ssize_t klen; apr_hash_this((apr_hash_index_t *)hi, NULL, &klen, NULL); return klen; -#endif } -void *svn__apr_hash_index_val(const apr_hash_index_t *hi) +void *apr_hash_this_val(apr_hash_index_t *hi) { -#if APR_VERSION_AT_LEAST(1, 5, 0) - return apr_hash_this_val((apr_hash_index_t *)hi); -#else void *val; apr_hash_this((apr_hash_index_t *)hi, NULL, NULL, &val); return val; -#endif } +#endif Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/log.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/log.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/log.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/log.c Wed Jul 30 11:23:49 2014 @@ -316,7 +316,7 @@ svn_log__lock(apr_hash_t *targets, for (hi = apr_hash_first(pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); svn_pool_clear(iterpool); if (space_separated_paths->len) svn_stringbuf_appendcstr(space_separated_paths, " "); @@ -339,7 +339,7 @@ svn_log__unlock(apr_hash_t *targets, for (hi = apr_hash_first(pool, targets); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); svn_pool_clear(iterpool); if (space_separated_paths->len) svn_stringbuf_appendcstr(space_separated_paths, " "); Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/mergeinfo.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/mergeinfo.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/mergeinfo.c Wed Jul 30 11:23:49 2014 @@ -1266,7 +1266,7 @@ svn_mergeinfo__set_inheritance(svn_merge hi; hi = apr_hash_next(hi)) { - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); if (rangelist) svn_rangelist__set_inheritance(rangelist, inheritable); @@ -1870,8 +1870,8 @@ svn_mergeinfo_intersect2(svn_mergeinfo_t for (hi = apr_hash_first(scratch_pool, mergeinfo1); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist1 = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_rangelist_t *rangelist1 = apr_hash_this_val(hi); svn_rangelist_t *rangelist2; svn_pool_clear(iterpool); @@ -1992,7 +1992,7 @@ svn_mergeinfo_sort(svn_mergeinfo_t input for (hi = apr_hash_first(pool, input); hi; hi = apr_hash_next(hi)) { - apr_array_header_t *rl = svn__apr_hash_index_val(hi); + apr_array_header_t *rl = apr_hash_this_val(hi); svn_sort__array(rl, svn_sort_compare_ranges); } @@ -2010,8 +2010,8 @@ svn_mergeinfo_catalog_dup(svn_mergeinfo_ hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - svn_mergeinfo_t val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + svn_mergeinfo_t val = apr_hash_this_val(hi); svn_hash_sets(new_mergeinfo_catalog, apr_pstrdup(pool, key), svn_mergeinfo_dup(val, pool)); @@ -2028,9 +2028,9 @@ svn_mergeinfo_dup(svn_mergeinfo_t mergei for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - apr_ssize_t pathlen = svn__apr_hash_index_klen(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + apr_ssize_t pathlen = apr_hash_this_key_len(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); apr_hash_set(new_mergeinfo, apr_pstrmemdup(pool, path, pathlen), pathlen, svn_rangelist_dup(rangelist, pool)); @@ -2056,9 +2056,9 @@ svn_mergeinfo_inheritable2(svn_mergeinfo hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - apr_ssize_t keylen = svn__apr_hash_index_klen(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + apr_ssize_t keylen = apr_hash_this_key_len(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); svn_rangelist_t *inheritable_rangelist; if (!path || svn_path_compare_paths(path, key) == 0) @@ -2141,8 +2141,8 @@ svn_mergeinfo__remove_empty_rangelists(s for (hi = apr_hash_first(scratch_pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); if (rangelist->nelts == 0) { @@ -2168,8 +2168,8 @@ svn_mergeinfo__remove_prefix_from_catalo for (hi = apr_hash_first(pool, in_catalog); hi; hi = apr_hash_next(hi)) { - const char *original_path = svn__apr_hash_index_key(hi); - svn_mergeinfo_t value = svn__apr_hash_index_val(hi); + const char *original_path = apr_hash_this_key(hi); + svn_mergeinfo_t value = apr_hash_this_val(hi); const char *new_path; new_path = svn_fspath__skip_ancestor(prefix_path, original_path); @@ -2196,8 +2196,8 @@ svn_mergeinfo__add_prefix_to_catalog(svn hi; hi = apr_hash_next(hi)) { - const char *original_path = svn__apr_hash_index_key(hi); - svn_mergeinfo_t value = svn__apr_hash_index_val(hi); + const char *original_path = apr_hash_this_key(hi); + svn_mergeinfo_t value = apr_hash_this_val(hi); if (original_path[0] == '/') original_path++; @@ -2227,8 +2227,8 @@ svn_mergeinfo__add_suffix_to_mergeinfo(s hi; hi = apr_hash_next(hi)) { - const char *fspath = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *fspath = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); svn_hash_sets(*out_mergeinfo, svn_fspath__join(fspath, suffix_relpath, result_pool), @@ -2370,7 +2370,7 @@ svn_mergeinfo__get_range_endpoints(svn_r for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); if (rangelist->nelts) { @@ -2407,8 +2407,8 @@ svn_mergeinfo__filter_catalog_by_ranges( hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_mergeinfo_t mergeinfo = apr_hash_this_val(hi); svn_mergeinfo_t filtered_mergeinfo; SVN_ERR(svn_mergeinfo__filter_mergeinfo_by_ranges(&filtered_mergeinfo, @@ -2452,8 +2452,8 @@ svn_mergeinfo__filter_mergeinfo_by_range hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); if (rangelist->nelts) { @@ -2489,8 +2489,8 @@ svn_mergeinfo__adjust_mergeinfo_rangelis hi = apr_hash_next(hi)) { int i; - const char *path = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); svn_rangelist_t *adjusted_rangelist = apr_array_make(result_pool, rangelist->nelts, sizeof(svn_merge_range_t *)); @@ -2529,7 +2529,7 @@ svn_mergeinfo__is_noninheritable(svn_mer hi; hi = apr_hash_next(hi)) { - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); int i; for (i = 0; i < rangelist->nelts; i++) @@ -2626,7 +2626,7 @@ svn_rangelist__merge_many(svn_rangelist_ hi; hi = apr_hash_next(hi)) { - svn_rangelist_t *subtree_rangelist = svn__apr_hash_index_val(hi); + svn_rangelist_t *subtree_rangelist = apr_hash_this_val(hi); svn_pool_clear(iterpool); SVN_ERR(svn_rangelist_merge2(merged_rangelist, subtree_rangelist, Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/object_pool.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/object_pool.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_subr/object_pool.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_subr/object_pool.c Wed Jul 30 11:23:49 2014 @@ -121,7 +121,7 @@ remove_unused_objects(svn_object_pool__t hi != NULL; hi = apr_hash_next(hi)) { - object_ref_t *object_ref = svn__apr_hash_index_val(hi); + object_ref_t *object_ref = apr_hash_this_val(hi); /* note that we won't hand out new references while access to the hash is serialized */ Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_crawler.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_crawler.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_crawler.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_crawler.c Wed Jul 30 11:23:49 2014 @@ -293,11 +293,11 @@ report_revisions_and_depths(svn_wc__db_t hi != NULL; hi = apr_hash_next(hi)) { - const char *child = svn__apr_hash_index_key(hi); + const char *child = apr_hash_this_key(hi); const char *this_report_relpath; const char *this_abspath; svn_boolean_t this_switched = FALSE; - struct svn_wc__db_base_info_t *ths = svn__apr_hash_index_val(hi); + struct svn_wc__db_base_info_t *ths = apr_hash_this_val(hi); if (cancel_func) SVN_ERR(cancel_func(cancel_baton)); Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_ops.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_ops.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_ops.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_ops.c Wed Jul 30 11:23:49 2014 @@ -417,7 +417,7 @@ have_recursive_parent(apr_hash_t *queue, for (hi = apr_hash_first(scratch_pool, queue); hi; hi = apr_hash_next(hi)) { - const committed_queue_item_t *qi = svn__apr_hash_index_val(hi); + const committed_queue_item_t *qi = apr_hash_this_val(hi); if (qi == item) continue; @@ -509,7 +509,7 @@ svn_wc_process_committed_queue2(svn_wc_c hi; hi = apr_hash_next(hi)) { - const char *wcroot_abspath = svn__apr_hash_index_key(hi); + const char *wcroot_abspath = apr_hash_this_key(hi); svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.c Wed Jul 30 11:23:49 2014 @@ -477,8 +477,7 @@ svn_wc__conflict_skel_add_prop_conflict( hi; hi = apr_hash_next(hi)) { - svn_skel__prepend_str(apr_pstrdup(result_pool, - svn__apr_hash_index_key(hi)), + svn_skel__prepend_str(apr_pstrdup(result_pool, apr_hash_this_key(hi)), conflict_names, result_pool); } @@ -1211,7 +1210,7 @@ svn_wc__conflict_create_markers(svn_skel hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); SVN_ERR(prop_conflict_skel_add( prop_data, propname, @@ -1994,7 +1993,7 @@ svn_wc__conflict_invoke_resolver(svn_wc_ hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); svn_boolean_t conflict_remains = TRUE; svn_pool_clear(iterpool); @@ -2163,7 +2162,7 @@ read_prop_conflict_descs(apr_array_heade hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); svn_string_t *old_value; svn_string_t *my_value; svn_string_t *their_value; @@ -2667,7 +2666,7 @@ resolve_prop_conflict_on_node(svn_boolea hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); svn_string_t *new_value = NULL; new_value = svn_hash_gets(resolve_from, propname); @@ -3170,7 +3169,7 @@ svn_wc__resolve_conflicts(svn_wc_context hi && !err; hi = apr_hash_next(hi)) { - tc_abspath = svn__apr_hash_index_key(hi); + tc_abspath = apr_hash_this_key(hi); svn_pool_clear(iterpool); svn_hash_sets(cswb.resolve_later, tc_abspath, NULL); Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c Wed Jul 30 11:23:49 2014 @@ -367,8 +367,8 @@ copy_versioned_dir(svn_wc__db_t *db, if (cancel_func) SVN_ERR(cancel_func(cancel_baton)); - child_name = svn__apr_hash_index_key(hi); - info = svn__apr_hash_index_val(hi); + child_name = apr_hash_this_key(hi); + info = apr_hash_this_val(hi); child_src_abspath = svn_dirent_join(src_abspath, child_name, iterpool); child_dst_abspath = svn_dirent_join(dst_abspath, child_name, iterpool); @@ -468,7 +468,7 @@ copy_versioned_dir(svn_wc__db_t *db, for (hi = apr_hash_first(scratch_pool, disk_children); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); + const char *name = apr_hash_this_key(hi); const char *unver_src_abspath, *unver_dst_abspath; svn_skel_t *work_item; @@ -950,8 +950,8 @@ remove_all_conflict_markers(svn_wc__db_t hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - struct svn_wc__db_info_t *info = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + struct svn_wc__db_info_t *info = apr_hash_this_val(hi); if (info->conflicted) { Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c Wed Jul 30 11:23:49 2014 @@ -127,7 +127,7 @@ gather_traversal_info(svn_wc_context_t * hi; hi = apr_hash_next(hi)) { - const char *node_abspath = svn__apr_hash_index_key(hi); + const char *node_abspath = apr_hash_this_key(hi); const char *relpath; relpath = svn_dirent_join(path, @@ -137,11 +137,11 @@ gather_traversal_info(svn_wc_context_t * if (gather_as_old) svn_hash_sets(traversal_info->externals_old, relpath, - svn__apr_hash_index_val(hi)); + apr_hash_this_val(hi)); if (gather_as_new) svn_hash_sets(traversal_info->externals_new, relpath, - svn__apr_hash_index_val(hi)); + apr_hash_this_val(hi)); svn_hash_sets(traversal_info->depths, relpath, svn_hash_gets(ambient_depths, node_abspath)); Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/entries.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/entries.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/entries.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/entries.c Wed Jul 30 11:23:49 2014 @@ -346,7 +346,7 @@ write_tree_conflicts(const char **confli { svn_skel_t *c_skel; - SVN_ERR(svn_wc__serialize_conflict(&c_skel, svn__apr_hash_index_val(hi), + SVN_ERR(svn_wc__serialize_conflict(&c_skel, apr_hash_this_val(hi), pool, pool)); svn_skel__prepend(c_skel, skel); } @@ -1342,7 +1342,7 @@ prune_deleted(apr_hash_t **entries_prune svn_boolean_t hidden; SVN_ERR(svn_wc__entry_is_hidden(&hidden, - svn__apr_hash_index_val(hi))); + apr_hash_this_val(hi))); if (hidden) break; } @@ -1360,8 +1360,8 @@ prune_deleted(apr_hash_t **entries_prune hi; hi = apr_hash_next(hi)) { - const void *key = svn__apr_hash_index_key(hi); - const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi); + const void *key = apr_hash_this_key(hi); + const svn_wc_entry_t *entry = apr_hash_this_val(hi); svn_boolean_t hidden; SVN_ERR(svn_wc__entry_is_hidden(&hidden, entry)); @@ -2357,9 +2357,9 @@ write_actual_only_entries(apr_hash_t *tr actual_node = MAYBE_ALLOC(actual_node, scratch_pool); actual_node->wc_id = wc_id; - actual_node->local_relpath = svn__apr_hash_index_key(hi); + actual_node->local_relpath = apr_hash_this_key(hi); actual_node->parent_relpath = parent_relpath; - actual_node->tree_conflict_data = svn__apr_hash_index_val(hi); + actual_node->tree_conflict_data = apr_hash_this_val(hi); SVN_ERR(insert_actual_node(sdb, db, wri_abspath, actual_node, scratch_pool)); @@ -2417,8 +2417,8 @@ svn_wc__write_upgraded_entries(void **di for (hi = apr_hash_first(scratch_pool, entries); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - const svn_wc_entry_t *this_entry = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + const svn_wc_entry_t *this_entry = apr_hash_this_val(hi); const char *child_abspath, *child_relpath; svn_wc__text_base_info_t *text_base_info = svn_hash_gets(text_bases_info, name); @@ -2572,8 +2572,8 @@ walker_helper(const char *dirpath, /* Loop over each of the other entries. */ for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - const svn_wc_entry_t *current_entry = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + const svn_wc_entry_t *current_entry = apr_hash_this_val(hi); const char *entrypath; const char *entry_abspath; svn_boolean_t hidden; Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/info.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/info.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/info.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/info.c Wed Jul 30 11:23:49 2014 @@ -539,7 +539,7 @@ svn_wc__get_info(svn_wc_context_t *wc_ct for (hi = apr_hash_first(scratch_pool, fe_baton.tree_conflicts); hi; hi = apr_hash_next(hi)) { - const char *this_abspath = svn__apr_hash_index_key(hi); + const char *this_abspath = apr_hash_this_key(hi); const svn_wc_conflict_description3_t *tree_conflict; svn_wc__info2_t *info; const apr_array_header_t *conflicts; Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/lock.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/lock.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/lock.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/lock.c Wed Jul 30 11:23:49 2014 @@ -1313,8 +1313,8 @@ do_close(svn_wc_adm_access_t *adm_access hi; hi = apr_hash_next(hi)) { - const char *abspath = svn__apr_hash_index_key(hi); - svn_wc_adm_access_t *child = svn__apr_hash_index_val(hi); + const char *abspath = apr_hash_this_key(hi); + svn_wc_adm_access_t *child = apr_hash_this_val(hi); const char *path = child->path; if (IS_MISSING(child)) Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/node.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/node.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/node.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/node.c Wed Jul 30 11:23:49 2014 @@ -387,8 +387,8 @@ walker_helper(svn_wc__db_t *db, hi; hi = apr_hash_next(hi)) { - const char *child_name = svn__apr_hash_index_key(hi); - struct svn_wc__db_walker_info_t *wi = svn__apr_hash_index_val(hi); + const char *child_name = apr_hash_this_key(hi); + struct svn_wc__db_walker_info_t *wi = apr_hash_this_val(hi); svn_node_kind_t child_kind = wi->kind; svn_wc__db_status_t child_status = wi->status; const char *child_abspath; Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/old-and-busted.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/old-and-busted.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/old-and-busted.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/old-and-busted.c Wed Jul 30 11:23:49 2014 @@ -1154,7 +1154,7 @@ resolve_to_defaults(apr_hash_t *entries, /* Then use it to fill in missing information in other entries. */ for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) { - svn_wc_entry_t *this_entry = svn__apr_hash_index_val(hi); + svn_wc_entry_t *this_entry = apr_hash_this_val(hi); if (this_entry == default_entry) /* THIS_DIR already has all the information it can possibly Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/props.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/props.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/props.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/props.c Wed Jul 30 11:23:49 2014 @@ -2055,8 +2055,8 @@ svn_wc__canonicalize_props(apr_hash_t ** for (hi = apr_hash_first(scratch_pool, (apr_hash_t *)props); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - const svn_string_t *value = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + const svn_string_t *value = apr_hash_this_val(hi); if (strcmp(name, SVN_PROP_MIME_TYPE) == 0) continue; Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/status.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/status.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/status.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/status.c Wed Jul 30 11:23:49 2014 @@ -947,7 +947,7 @@ is_external_path(apr_hash_t *externals, hi; hi = apr_hash_next(hi)) { - const char *external_abspath = svn__apr_hash_index_key(hi); + const char *external_abspath = apr_hash_this_key(hi); if (svn_dirent_is_child(local_abspath, external_abspath, NULL)) return TRUE; @@ -1937,8 +1937,8 @@ handle_statii(struct edit_baton *eb, /* Loop over all the statii still in our hash, handling each one. */ for (hi = apr_hash_first(pool, statii); hi; hi = apr_hash_next(hi)) { - const char *local_abspath = svn__apr_hash_index_key(hi); - svn_wc_status3_t *status = svn__apr_hash_index_val(hi); + const char *local_abspath = apr_hash_this_key(hi); + svn_wc_status3_t *status = apr_hash_this_val(hi); /* Clear the subpool. */ svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c Wed Jul 30 11:23:49 2014 @@ -2615,7 +2615,7 @@ close_directory(void *dir_baton, hi != NULL; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); svn_prop_t *prop = apr_array_push(regular_prop_changes); /* Record a deletion for PROPNAME. */ @@ -2720,11 +2720,11 @@ close_directory(void *dir_baton, svn_pool_clear(iterpool); - child_name = svn__apr_hash_index_key(hi); + child_name = apr_hash_this_key(hi); child_abspath = svn_dirent_join(db->local_abspath, child_name, iterpool); - dirent = svn__apr_hash_index_val(hi); + dirent = apr_hash_this_val(hi); child_kind = (dirent->kind == svn_node_dir) ? svn_node_dir : svn_node_file; @@ -2787,10 +2787,9 @@ close_directory(void *dir_baton, hi; hi = apr_hash_next(hi)) { - const char *child = svn__apr_hash_index_key(hi); + const char *child = apr_hash_this_key(hi); const char *child_abspath, *child_relpath; - svn_node_kind_t kind = svn_node_kind_from_word( - svn__apr_hash_index_val(hi)); + svn_node_kind_t kind = svn_node_kind_from_word(apr_hash_this_val(hi)); svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/upgrade.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/upgrade.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/upgrade.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/upgrade.c Wed Jul 30 11:23:49 2014 @@ -193,7 +193,7 @@ read_many_wcprops(apr_hash_t **all_wcpro hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); + const char *name = apr_hash_this_key(hi); svn_pool_clear(iterpool); @@ -293,15 +293,15 @@ get_versioned_subdirs(apr_array_header_t hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + const svn_wc_entry_t *entry = apr_hash_this_val(hi); const char *child_abspath; svn_boolean_t hidden; /* skip "this dir" */ if (*name == '\0') { - this_dir = svn__apr_hash_index_val(hi); + this_dir = apr_hash_this_val(hi); continue; } else if (entry->kind != svn_node_dir) @@ -612,13 +612,13 @@ ensure_repos_info(svn_wc_entry_t *entry, for (hi = apr_hash_first(scratch_pool, repos_cache); hi; hi = apr_hash_next(hi)) { - if (svn_uri__is_ancestor(svn__apr_hash_index_key(hi), entry->url)) + if (svn_uri__is_ancestor(apr_hash_this_key(hi), entry->url)) { if (!entry->repos) - entry->repos = svn__apr_hash_index_key(hi); + entry->repos = apr_hash_this_key(hi); if (!entry->uuid) - entry->uuid = svn__apr_hash_index_val(hi); + entry->uuid = apr_hash_this_val(hi); return SVN_NO_ERROR; } @@ -727,8 +727,7 @@ migrate_single_tree_conflict_data(svn_sq hi; hi = apr_hash_next(hi)) { - const svn_wc_conflict_description3_t *conflict = - svn__apr_hash_index_val(hi); + const svn_wc_conflict_description3_t *conflict = apr_hash_this_val(hi); const char *conflict_relpath; const char *conflict_data; svn_sqlite__stmt_t *stmt; @@ -1017,7 +1016,7 @@ migrate_text_bases(apr_hash_t **text_bas for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = apr_hash_next(hi)) { - const char *text_base_basename = svn__apr_hash_index_key(hi); + const char *text_base_basename = apr_hash_this_key(hi); svn_checksum_t *md5_checksum; svn_checksum_t *sha1_checksum; Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c Wed Jul 30 11:23:49 2014 @@ -1339,7 +1339,7 @@ flush_entries(svn_wc__db_wcroot_t *wcroo hi; hi = apr_hash_next(hi)) { - const char *item_abspath = svn__apr_hash_index_key(hi); + const char *item_abspath = apr_hash_this_key(hi); if ((depth == svn_depth_files || depth == svn_depth_immediates) && is_immediate_child_path(local_abspath, item_abspath)) @@ -10235,7 +10235,7 @@ filter_unwanted_props(apr_hash_t *prop_h hi; hi = apr_hash_next(hi)) { - const char *ipropname = svn__apr_hash_index_key(hi); + const char *ipropname = apr_hash_this_key(hi); if (strcmp(ipropname, propname) != 0) svn_hash_sets(prop_hash, ipropname, NULL); @@ -10559,7 +10559,7 @@ get_children_with_cached_iprops(apr_hash hi; hi = apr_hash_next(hi)) { - const char *child_abspath = svn__apr_hash_index_key(hi); + const char *child_abspath = apr_hash_this_key(hi); const char *child_relpath; svn_node_kind_t child_kind; @@ -11092,8 +11092,8 @@ moved_descendant_commit(svn_wc__db_wcroo iterpool = svn_pool_create(scratch_pool); for (hi = apr_hash_first(scratch_pool, children); hi; hi = apr_hash_next(hi)) { - const char *src_relpath = svn__apr_hash_index_key(hi); - const char *to_relpath = svn__apr_hash_index_val(hi); + const char *src_relpath = apr_hash_this_key(hi); + const char *to_relpath = apr_hash_this_val(hi); const char *new_repos_relpath; int to_op_depth = relpath_depth(to_relpath); int affected; @@ -11673,14 +11673,14 @@ bump_node_revision(svn_wc__db_wcroot_t * scratch_pool, iterpool)); for (hi = apr_hash_first(scratch_pool, children); hi; hi = apr_hash_next(hi)) { - const char *child_basename = svn__apr_hash_index_key(hi); + const char *child_basename = apr_hash_this_key(hi); const struct svn_wc__db_base_info_t *child_info; const char *child_local_relpath; const char *child_repos_relpath = NULL; svn_pool_clear(iterpool); - child_info = svn__apr_hash_index_val(hi); + child_info = apr_hash_this_val(hi); if (child_info->update_root && child_info->kind == svn_node_file) continue; /* Skip file externals */ @@ -12779,8 +12779,8 @@ svn_wc__db_upgrade_apply_dav_cache(svn_s hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - apr_hash_t *props = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + apr_hash_t *props = apr_hash_this_val(hi); const char *local_relpath; svn_pool_clear(iterpool); @@ -13151,8 +13151,8 @@ wq_record(svn_wc__db_wcroot_t *wcroot, for (hi = apr_hash_first(scratch_pool, record_map); hi; hi = apr_hash_next(hi)) { - const char *local_abspath = svn__apr_hash_index_key(hi); - const svn_io_dirent2_t *dirent = svn__apr_hash_index_val(hi); + const char *local_abspath = apr_hash_this_key(hi); + const svn_io_dirent2_t *dirent = apr_hash_this_val(hi); const char *local_relpath = svn_dirent_skip_ancestor(wcroot->abspath, local_abspath); @@ -13365,7 +13365,7 @@ svn_wc__db_temp_get_all_access(svn_wc__d hi; hi = apr_hash_next(hi)) { - const svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); + const svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); /* This is highly redundant, 'cause the same WCROOT will appear many times in dir_data. */
