Modified: subversion/trunk/subversion/libsvn_repos/hooks.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/hooks.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/hooks.c (original) +++ subversion/trunk/subversion/libsvn_repos/hooks.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_repos/load-fs-vtable.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c (original) +++ subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_repos/log.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/log.c (original) +++ subversion/trunk/subversion/libsvn_repos/log.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_repos/replay.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/replay.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/replay.c (original) +++ subversion/trunk/subversion/libsvn_repos/replay.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_repos/reporter.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/reporter.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/reporter.c (original) +++ subversion/trunk/subversion/libsvn_repos/reporter.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_repos/rev_hunt.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/rev_hunt.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_repos/rev_hunt.c (original) +++ subversion/trunk/subversion/libsvn_repos/rev_hunt.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/config_auth.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/config_auth.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/config_auth.c (original) +++ subversion/trunk/subversion/libsvn_subr/config_auth.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/debug.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/debug.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/debug.c (original) +++ subversion/trunk/subversion/libsvn_subr/debug.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/hash.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/hash.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/hash.c (original) +++ subversion/trunk/subversion/libsvn_subr/hash.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/io.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/io.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/io.c (original) +++ subversion/trunk/subversion/libsvn_subr/io.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/iter.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/iter.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/iter.c (original) +++ subversion/trunk/subversion/libsvn_subr/iter.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/log.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/log.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/log.c (original) +++ subversion/trunk/subversion/libsvn_subr/log.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/mergeinfo.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original) +++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_subr/object_pool.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/object_pool.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/object_pool.c (original) +++ subversion/trunk/subversion/libsvn_subr/object_pool.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/adm_crawler.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original) +++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/adm_ops.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original) +++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/conflicts.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/conflicts.c (original) +++ subversion/trunk/subversion/libsvn_wc/conflicts.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/copy.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/copy.c (original) +++ subversion/trunk/subversion/libsvn_wc/copy.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/deprecated.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/deprecated.c (original) +++ subversion/trunk/subversion/libsvn_wc/deprecated.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/entries.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/entries.c (original) +++ subversion/trunk/subversion/libsvn_wc/entries.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/info.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/info.c (original) +++ subversion/trunk/subversion/libsvn_wc/info.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/lock.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/lock.c (original) +++ subversion/trunk/subversion/libsvn_wc/lock.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/node.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/node.c (original) +++ subversion/trunk/subversion/libsvn_wc/node.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/old-and-busted.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/old-and-busted.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/old-and-busted.c (original) +++ subversion/trunk/subversion/libsvn_wc/old-and-busted.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/props.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/props.c (original) +++ subversion/trunk/subversion/libsvn_wc/props.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/status.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/status.c (original) +++ subversion/trunk/subversion/libsvn_wc/status.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/update_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/update_editor.c (original) +++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/upgrade.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/upgrade.c (original) +++ subversion/trunk/subversion/libsvn_wc/upgrade.c Wed Jul 30 11:02:19 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/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Jul 30 11:02:19 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. */ Modified: subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Wed Jul 30 11:02:19 2014 @@ -245,8 +245,8 @@ svn_wc__db_close(svn_wc__db_t *db) hi; hi = apr_hash_next(hi)) { - svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); - const char *local_abspath = svn__apr_hash_index_key(hi); + svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); + const char *local_abspath = apr_hash_this_key(hi); if (wcroot->sdb) svn_hash_sets(roots, wcroot->abspath, wcroot); @@ -362,7 +362,7 @@ svn_wc__db_close_many_wcroots(apr_hash_t for (hi = apr_hash_first(scratch_pool, roots); hi; hi = apr_hash_next(hi)) { - svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); + svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); apr_status_t result; result = apr_pool_cleanup_run(state_pool, wcroot, close_wcroot); @@ -916,10 +916,10 @@ svn_wc__db_drop_root(svn_wc__db_t *db, hi; hi = apr_hash_next(hi)) { - svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); + svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); if (wcroot == root_wcroot) - svn_hash_sets(db->dir_data, svn__apr_hash_index_key(hi), NULL); + svn_hash_sets(db->dir_data, apr_hash_this_key(hi), NULL); } result = apr_pool_cleanup_run(db->state_pool, root_wcroot, close_wcroot); Modified: subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c (original) +++ subversion/trunk/subversion/mod_dav_svn/reports/inherited-props.c Wed Jul 30 11:02:19 2014 @@ -156,8 +156,8 @@ dav_svn__get_inherited_props_report(cons hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + svn_string_t *propval = apr_hash_this_val(hi); const char *xml_safe; serr = dav_svn__brigade_printf( Modified: subversion/trunk/subversion/mod_dav_svn/version.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/mod_dav_svn/version.c (original) +++ subversion/trunk/subversion/mod_dav_svn/version.c Wed Jul 30 11:02:19 2014 @@ -1388,8 +1388,8 @@ release_locks(apr_hash_t *locks, for (hi = apr_hash_first(subpool, locks); 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_hash_sets(targets, path, token); } Modified: subversion/trunk/subversion/svn/log-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svn/log-cmd.c (original) +++ subversion/trunk/subversion/svn/log-cmd.c Wed Jul 30 11:02:19 2014 @@ -147,14 +147,14 @@ match_search_pattern(const char *search_ hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); svn_log_changed_path2_t *log_item; if (apr_fnmatch(pattern, path, flags) == APR_SUCCESS) return TRUE; /* Match copy-from paths, too. */ - log_item = svn__apr_hash_index_val(hi); + log_item = apr_hash_this_val(hi); if (log_item->copyfrom_path && SVN_IS_VALID_REVNUM(log_item->copyfrom_rev) && apr_fnmatch(pattern, @@ -821,8 +821,8 @@ svn_cl__log(apr_getopt_t *os, hi != NULL; hi = apr_hash_next(hi)) { - const char *property = svn__apr_hash_index_key(hi); - svn_string_t *value = svn__apr_hash_index_val(hi); + const char *property = apr_hash_this_key(hi); + svn_string_t *value = apr_hash_this_val(hi); if (value && value->data[0] != '\0') return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, Modified: subversion/trunk/subversion/svn/propget-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/propget-cmd.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svn/propget-cmd.c (original) +++ subversion/trunk/subversion/svn/propget-cmd.c Wed Jul 30 11:02:19 2014 @@ -89,7 +89,7 @@ print_properties_xml(const char *pname, const char *name_local; svn_prop_inherited_item_t *iprop = APR_ARRAY_IDX(inherited_props, i, svn_prop_inherited_item_t *); - svn_string_t *propval = svn__apr_hash_index_val( + svn_string_t *propval = apr_hash_this_val( apr_hash_first(pool, iprop->prop_hash)); sb = NULL; @@ -278,7 +278,7 @@ print_properties(svn_stream_t *out, { svn_prop_inherited_item_t *iprop = APR_ARRAY_IDX(inherited_props, i, svn_prop_inherited_item_t *); - svn_string_t *propval = svn__apr_hash_index_val(apr_hash_first(pool, + svn_string_t *propval = apr_hash_this_val(apr_hash_first(pool, iprop->prop_hash)); SVN_ERR(print_single_prop(propval, target_abspath_or_url, iprop->path_or_url, Modified: subversion/trunk/subversion/svn/status-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svn/status-cmd.c (original) +++ subversion/trunk/subversion/svn/status-cmd.c Wed Jul 30 11:02:19 2014 @@ -379,8 +379,8 @@ svn_cl__status(apr_getopt_t *os, for (hi = apr_hash_first(scratch_pool, master_cl_hash); hi; hi = apr_hash_next(hi)) { - const char *changelist_name = svn__apr_hash_index_key(hi); - apr_array_header_t *path_array = svn__apr_hash_index_val(hi); + const char *changelist_name = apr_hash_this_key(hi); + apr_array_header_t *path_array = apr_hash_this_val(hi); int j; /* ### TODO: For non-XML output, we shouldn't print the Modified: subversion/trunk/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/svn.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svn/svn.c (original) +++ subversion/trunk/subversion/svn/svn.c Wed Jul 30 11:02:19 2014 @@ -2532,7 +2532,7 @@ sub_main(int *exit_code, int argc, const for (hi = apr_hash_first(pool, opt_state.revprop_table); hi; hi = apr_hash_next(hi)) { - SVN_ERR(svn_cl__check_svn_prop_name(svn__apr_hash_index_key(hi), + SVN_ERR(svn_cl__check_svn_prop_name(apr_hash_this_key(hi), TRUE, svn_cl__prop_use_use, pool)); } Modified: subversion/trunk/subversion/svnadmin/svnadmin.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/svnadmin.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnadmin/svnadmin.c (original) +++ subversion/trunk/subversion/svnadmin/svnadmin.c Wed Jul 30 11:02:19 2014 @@ -2118,8 +2118,8 @@ subcommand_lslocks(apr_getopt_t *os, voi for (hi = apr_hash_first(pool, locks); hi; hi = apr_hash_next(hi)) { const char *cr_date, *exp_date = ""; - const char *path = svn__apr_hash_index_key(hi); - svn_lock_t *lock = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_lock_t *lock = apr_hash_this_val(hi); int comment_lines = 0; svn_pool_clear(iterpool); Modified: subversion/trunk/subversion/svndumpfilter/svndumpfilter.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/svndumpfilter.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svndumpfilter/svndumpfilter.c (original) +++ subversion/trunk/subversion/svndumpfilter/svndumpfilter.c Wed Jul 30 11:02:19 2014 @@ -348,8 +348,8 @@ new_revision_record(void **revision_bato for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const char *val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const char *val = apr_hash_this_val(hi); if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH)) || (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH)) @@ -415,8 +415,8 @@ output_revision(struct revision_baton_t hi; hi = apr_hash_next(hi)) { - const char *pname = svn__apr_hash_index_key(hi); - const svn_string_t *pval = svn__apr_hash_index_val(hi); + const char *pname = apr_hash_this_key(hi); + const svn_string_t *pval = apr_hash_this_val(hi); write_prop_to_stringbuf(props, pname, pval); } @@ -651,8 +651,8 @@ new_node_record(void **node_baton, for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const char *val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const char *val = apr_hash_this_val(hi); if ((!strcmp(key, SVN_REPOS_DUMPFILE_PROP_DELTA)) && (!strcmp(val, "true"))) @@ -803,8 +803,8 @@ adjust_mergeinfo(svn_string_t **final_va 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_t *pb = rb->pb; /* Determine whether the merge_source is a part of the prefix. */ @@ -1303,7 +1303,7 @@ do_filter(apr_getopt_t *os, hi; hi = apr_hash_next(hi)) { - const svn_revnum_t *revnum = svn__apr_hash_index_key(hi); + const svn_revnum_t *revnum = apr_hash_this_key(hi); APR_ARRAY_PUSH(keys, svn_revnum_t) = *revnum; } @@ -1346,7 +1346,7 @@ do_filter(apr_getopt_t *os, hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); APR_ARRAY_PUSH(keys, const char *) = path; } Modified: subversion/trunk/subversion/svnlook/svnlook.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/svnlook.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnlook/svnlook.c (original) +++ subversion/trunk/subversion/svnlook/svnlook.c Wed Jul 30 11:02:19 2014 @@ -1769,8 +1769,7 @@ do_pget(svnlook_ctxt_t *c, else { svn_string_t *propval = - svn__apr_hash_index_val(apr_hash_first(pool, - elt->prop_hash)); + apr_hash_this_val(apr_hash_first(pool, elt->prop_hash)); SVN_ERR(svn_stream_printf( stdout_stream, pool, "%s - ", @@ -1953,8 +1952,8 @@ do_plist(svnlook_ctxt_t *c, for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { - const char *pname = svn__apr_hash_index_key(hi); - svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *pname = apr_hash_this_key(hi); + svn_string_t *propval = apr_hash_this_val(hi); SVN_ERR(check_cancel(NULL)); Modified: subversion/trunk/subversion/svnrdump/dump_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnrdump/dump_editor.c (original) +++ subversion/trunk/subversion/svnrdump/dump_editor.c Wed Jul 30 11:02:19 2014 @@ -794,7 +794,7 @@ close_directory(void *dir_baton, for (hi = apr_hash_first(pool, db->deleted_entries); 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(dump_node(db->eb, path, NULL, NULL, svn_node_action_delete, FALSE, NULL, SVN_INVALID_REVNUM, pool)); Modified: subversion/trunk/subversion/svnrdump/load_editor.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnrdump/load_editor.c (original) +++ subversion/trunk/subversion/svnrdump/load_editor.c Wed Jul 30 11:02:19 2014 @@ -557,8 +557,8 @@ new_revision_record(void **revision_bato for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi)) { - const char *hname = svn__apr_hash_index_key(hi); - const char *hval = svn__apr_hash_index_val(hi); + const char *hname = apr_hash_this_key(hi); + const char *hval = apr_hash_this_val(hi); if (strcmp(hname, SVN_REPOS_DUMPFILE_REVISION_NUMBER) == 0) rb->rev = atoi(hval); @@ -669,8 +669,8 @@ new_node_record(void **node_baton, for (hi = apr_hash_first(rb->pool, headers); hi; hi = apr_hash_next(hi)) { - const char *hname = svn__apr_hash_index_key(hi); - const char *hval = svn__apr_hash_index_val(hi); + const char *hname = apr_hash_this_key(hi); + const char *hval = apr_hash_this_val(hi); /* Parse the different kinds of headers we can encounter and stuff them into the node_baton for writing later */ @@ -1009,7 +1009,7 @@ remove_node_props(void *baton) for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); + const char *name = apr_hash_this_key(hi); svn_prop_kind_t kind = svn_property_kind2(name); if (kind == svn_prop_regular_kind) Modified: subversion/trunk/subversion/svnrdump/util.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/util.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnrdump/util.c (original) +++ subversion/trunk/subversion/svnrdump/util.c Wed Jul 30 11:02:19 2014 @@ -61,8 +61,8 @@ svn_rdump__normalize_props(apr_hash_t ** for (hi = apr_hash_first(result_pool, props); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const svn_string_t *value = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const svn_string_t *value = apr_hash_this_val(hi); SVN_ERR(svn_rdump__normalize_prop(key, &value, result_pool)); Modified: subversion/trunk/subversion/svnserve/serve.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnserve/serve.c (original) +++ subversion/trunk/subversion/svnserve/serve.c Wed Jul 30 11:02:19 2014 @@ -1743,8 +1743,8 @@ static svn_error_t *get_dir(svn_ra_svn_c subpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - svn_fs_dirent_t *fsent = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_fs_dirent_t *fsent = apr_hash_this_val(hi); const char *file_path; /* The fields in the entry tuple. */ @@ -2100,8 +2100,8 @@ static svn_error_t *get_mergeinfo(svn_ra iterpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - svn_mergeinfo_t value = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + svn_mergeinfo_t value = apr_hash_this_val(hi); svn_string_t *mergeinfo_string; svn_pool_clear(iterpool); @@ -2160,8 +2160,8 @@ static svn_error_t *log_receiver(void *b for (h = apr_hash_first(pool, log_entry->changed_paths2); h; h = apr_hash_next(h)) { - const char *path = svn__apr_hash_index_key(h); - svn_log_changed_path2_t *change = svn__apr_hash_index_val(h); + const char *path = apr_hash_this_key(h); + svn_log_changed_path2_t *change = apr_hash_this_val(h); SVN_ERR(svn_ra_svn__write_data_log_changed_path( conn, pool, @@ -2446,8 +2446,8 @@ static svn_error_t *get_locations(svn_ra for (iter = apr_hash_first(pool, fs_locations); iter; iter = apr_hash_next(iter)) { - const svn_revnum_t *iter_key = svn__apr_hash_index_key(iter); - const char *iter_value = svn__apr_hash_index_val(iter); + const svn_revnum_t *iter_key = apr_hash_this_key(iter); + const char *iter_value = apr_hash_this_val(iter); SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "rc", *iter_key, iter_value)); @@ -2743,7 +2743,7 @@ clear_lock_result_hash(apr_hash_t *resul for (hi = apr_hash_first(scratch_pool, results); hi; hi = apr_hash_next(hi)) { - struct lock_result_t *result = svn__apr_hash_index_val(hi); + struct lock_result_t *result = apr_hash_this_val(hi); svn_error_clear(result->err); } } @@ -2812,7 +2812,7 @@ static svn_error_t *lock_many(svn_ra_svn results, are cleared before returning from this function. */ for (hi = apr_hash_first(pool, targets); hi; hi = apr_hash_next(hi)) { - const char *full_path = svn__apr_hash_index_key(hi); + const char *full_path = apr_hash_this_key(hi); svn_pool_clear(subpool); @@ -2990,7 +2990,7 @@ static svn_error_t *unlock_many(svn_ra_s results, are cleared before returning from this function. */ for (hi = apr_hash_first(pool, targets); hi; hi = apr_hash_next(hi)) { - const char *full_path = svn__apr_hash_index_key(hi); + const char *full_path = apr_hash_this_key(hi); svn_pool_clear(subpool); @@ -3145,7 +3145,7 @@ static svn_error_t *get_locks(svn_ra_svn SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "w((!", "success")); for (hi = apr_hash_first(pool, locks); hi; hi = apr_hash_next(hi)) { - svn_lock_t *l = svn__apr_hash_index_val(hi); + svn_lock_t *l = apr_hash_this_val(hi); SVN_ERR(write_lock(conn, pool, l)); } Modified: subversion/trunk/subversion/svnsync/svnsync.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/svnsync.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnsync/svnsync.c (original) +++ subversion/trunk/subversion/svnsync/svnsync.c Wed Jul 30 11:02:19 2014 @@ -486,7 +486,7 @@ remove_props_not_in_source(svn_ra_sessio hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); svn_pool_clear(subpool); @@ -530,8 +530,8 @@ filter_props(int *filtered_count, apr_ha for (hi = apr_hash_first(pool, props); hi ; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - void *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + void *propval = apr_hash_this_val(hi); /* Copy all properties: - not matching the exclude pattern if provided OR @@ -572,8 +572,8 @@ write_revprops(int *filtered_count, for (hi = apr_hash_first(pool, rev_props); hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - const svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + const svn_string_t *propval = apr_hash_this_val(hi); svn_pool_clear(subpool); Modified: subversion/trunk/subversion/svnsync/sync.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/sync.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/svnsync/sync.c (original) +++ subversion/trunk/subversion/svnsync/sync.c Wed Jul 30 11:02:19 2014 @@ -107,8 +107,8 @@ svnsync_normalize_revprops(apr_hash_t *r hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - const svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + const svn_string_t *propval = apr_hash_this_val(hi); if (svn_prop_needs_translation(propname)) { Modified: subversion/trunk/subversion/tests/cmdline/entries-dump.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries-dump.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/tests/cmdline/entries-dump.c (original) +++ subversion/trunk/subversion/tests/cmdline/entries-dump.c Wed Jul 30 11:02:19 2014 @@ -112,8 +112,8 @@ entries_dump(const char *dir_path, svn_w for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const svn_wc_entry_t *entry = apr_hash_this_val(hi); SVN_ERR_ASSERT(strcmp(key, entry->name) == 0); @@ -214,7 +214,7 @@ directory_dump_old(struct directory_walk scratch_pool, scratch_pool)); for (hi = apr_hash_first(scratch_pool, entries); hi; hi = apr_hash_next(hi)) { - const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi); + const svn_wc_entry_t *entry = apr_hash_this_val(hi); const char *local_abspath; if (entry->deleted || entry->absent || entry->kind != svn_node_dir) Modified: subversion/trunk/subversion/tests/libsvn_fs/locks-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_fs/locks-test.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_fs/locks-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_fs/locks-test.c Wed Jul 30 11:02:19 2014 @@ -946,7 +946,7 @@ lock_multiple_paths(const svn_test_opts_ /* Unlock without force and wrong tokens. */ for (hi = apr_hash_first(pool, lock_paths); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_paths, svn__apr_hash_index_key(hi), "wrong-token"); + svn_hash_sets(unlock_paths, apr_hash_this_key(hi), "wrong-token"); apr_hash_clear(baton.results); SVN_ERR(svn_fs_unlock_many(fs, unlock_paths, FALSE, lock_many_cb, &baton, pool, pool)); @@ -963,7 +963,7 @@ lock_multiple_paths(const svn_test_opts_ /* Force unlock. */ for (hi = apr_hash_first(pool, lock_paths); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_paths, svn__apr_hash_index_key(hi), ""); + svn_hash_sets(unlock_paths, apr_hash_this_key(hi), ""); apr_hash_clear(baton.results); SVN_ERR(svn_fs_unlock_many(fs, unlock_paths, TRUE, lock_many_cb, &baton, pool, pool)); @@ -997,8 +997,8 @@ lock_multiple_paths(const svn_test_opts_ /* Unlock without force. */ for (hi = apr_hash_first(pool, baton.results); hi; hi = apr_hash_next(hi)) { - struct lock_result_t *result = svn__apr_hash_index_val(hi); - svn_hash_sets(unlock_paths, svn__apr_hash_index_key(hi), + struct lock_result_t *result = apr_hash_this_val(hi); + svn_hash_sets(unlock_paths, apr_hash_this_key(hi), result->lock ? result->lock->token : "non-existent-token"); } apr_hash_clear(baton.results); Modified: subversion/trunk/subversion/tests/libsvn_ra/ra-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_ra/ra-test.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_ra/ra-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_ra/ra-test.c Wed Jul 30 11:02:19 2014 @@ -513,7 +513,7 @@ lock_test(const svn_test_opts_t *opts, /* Unlock without force and wrong lock tokens */ for (hi = apr_hash_first(pool, lock_targets); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_targets, svn__apr_hash_index_key(hi), "wrong-token"); + svn_hash_sets(unlock_targets, apr_hash_this_key(hi), "wrong-token"); apr_hash_clear(baton.results); SVN_ERR(svn_ra_unlock(session, unlock_targets, FALSE, lock_cb, &baton, pool)); @@ -525,7 +525,7 @@ lock_test(const svn_test_opts_t *opts, /* Force unlock */ for (hi = apr_hash_first(pool, lock_targets); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_targets, svn__apr_hash_index_key(hi), ""); + svn_hash_sets(unlock_targets, apr_hash_this_key(hi), ""); apr_hash_clear(baton.results); SVN_ERR(svn_ra_unlock(session, unlock_targets, TRUE, lock_cb, &baton, pool)); @@ -548,8 +548,8 @@ lock_test(const svn_test_opts_t *opts, for (hi = apr_hash_first(pool, baton.results); hi; hi = apr_hash_next(hi)) { - result = svn__apr_hash_index_val(hi); - svn_hash_sets(unlock_targets, svn__apr_hash_index_key(hi), + result = apr_hash_this_val(hi); + svn_hash_sets(unlock_targets, apr_hash_this_key(hi), result->lock ? result->lock->token : "non-existent-token"); } apr_hash_clear(baton.results); Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Wed Jul 30 11:02:19 2014 @@ -1987,8 +1987,8 @@ test_dirent_get_absolute_from_lc_drive(a for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi)) { - const char *dir = svn__apr_hash_index_key(hi); - svn_io_dirent2_t *de = svn__apr_hash_index_val(hi); + const char *dir = apr_hash_this_key(hi); + svn_io_dirent2_t *de = apr_hash_this_val(hi); if (de->kind == svn_node_dir && strcmp(dir, current_dir_on_C)) Modified: subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/trunk/subversion/tests/libsvn_wc/op-depth-test.c Wed Jul 30 11:02:19 2014 @@ -441,7 +441,7 @@ check_db_conflicts(svn_test__sandbox_t * for (hi = apr_hash_first(b->pool, found_hash); hi; hi = apr_hash_next(hi)) { svn_skel_t *conflict; - conflict_info_t *info = svn__apr_hash_index_val(hi); + conflict_info_t *info = apr_hash_this_val(hi); const char *local_abspath; svn_pool_clear(iterpool); @@ -2050,7 +2050,7 @@ check_db_actual(svn_test__sandbox_t* b, if (apr_hash_count(path_hash)) { const char *local_relpath - = svn__apr_hash_index_key(apr_hash_first(b->pool, path_hash)); + = apr_hash_this_key(apr_hash_first(b->pool, path_hash)); return svn_error_createf(SVN_ERR_TEST_FAILED, svn_sqlite__reset(stmt), "actual '%s' expected", local_relpath); } @@ -2651,7 +2651,7 @@ check_hash_keys(apr_hash_t *hash, for (hi = apr_hash_first(scratch_pool, hash); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); + const char *name = apr_hash_this_key(hi); err = svn_error_compose_create( err, svn_error_createf(SVN_ERR_TEST_FAILED, NULL, _("Found, not expected: '%s'"), name)); Modified: subversion/trunk/subversion/tests/svn_test_fs.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/subversion/tests/svn_test_fs.c (original) +++ subversion/trunk/subversion/tests/svn_test_fs.c Wed Jul 30 11:02:19 2014 @@ -548,23 +548,23 @@ svn_test__validate_changes(svn_fs_root_t { int i; for (i=0, hi = apr_hash_first(pool, expected); hi; hi = apr_hash_next(hi)) - SVN_DBG(("expected[%d] = '%s'\n", i++, svn__apr_hash_index_key(hi))); + SVN_DBG(("expected[%d] = '%s'\n", i++, apr_hash_this_key(hi))); for (i=0, hi = apr_hash_first(pool, actual); hi; hi = apr_hash_next(hi)) - SVN_DBG(("actual[%d] = '%s'\n", i++, svn__apr_hash_index_key(hi))); + SVN_DBG(("actual[%d] = '%s'\n", i++, apr_hash_this_key(hi))); } #endif for (hi = apr_hash_first(pool, expected); hi; hi = apr_hash_next(hi)) - if (NULL == svn_hash_gets(actual, svn__apr_hash_index_key(hi))) + if (NULL == svn_hash_gets(actual, apr_hash_this_key(hi))) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Path '%s' missing from actual changed-paths", - (const char *)svn__apr_hash_index_key(hi)); + (const char *)apr_hash_this_key(hi)); for (hi = apr_hash_first(pool, actual); hi; hi = apr_hash_next(hi)) - if (NULL == svn_hash_gets(expected, svn__apr_hash_index_key(hi))) + if (NULL == svn_hash_gets(expected, apr_hash_this_key(hi))) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Path '%s' missing from expected changed-paths", - (const char *)svn__apr_hash_index_key(hi)); + (const char *)apr_hash_this_key(hi)); return SVN_NO_ERROR; } Modified: subversion/trunk/tools/client-side/svn-bench/null-info-cmd.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svn-bench/null-info-cmd.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/tools/client-side/svn-bench/null-info-cmd.c (original) +++ subversion/trunk/tools/client-side/svn-bench/null-info-cmd.c Wed Jul 30 11:02:19 2014 @@ -80,8 +80,8 @@ push_dir_info(svn_ra_session_t *ra_sessi for (hi = apr_hash_first(pool, tmpdirents); hi; hi = apr_hash_next(hi)) { const char *path; - const char *name = svn__apr_hash_index_key(hi); - svn_dirent_t *the_ent = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_dirent_t *the_ent = apr_hash_this_val(hi); svn_client__pathrev_t *child_pathrev; svn_pool_clear(subpool); Modified: subversion/trunk/tools/server-side/svn-rep-sharing-stats.c URL: http://svn.apache.org/viewvc/subversion/trunk/tools/server-side/svn-rep-sharing-stats.c?rev=1614611&r1=1614610&r2=1614611&view=diff ============================================================================== --- subversion/trunk/tools/server-side/svn-rep-sharing-stats.c (original) +++ subversion/trunk/tools/server-side/svn-rep-sharing-stats.c Wed Jul 30 11:02:19 2014 @@ -282,8 +282,8 @@ process_one_revision(svn_fs_t *fs, node_revision_t *node_rev; - path = svn__apr_hash_index_key(hi); - change = svn__apr_hash_index_val(hi); + path = apr_hash_this_key(hi); + change = apr_hash_this_val(hi); if (! quiet) SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "processing r%ld:%s\n", revnum, path)); @@ -341,7 +341,7 @@ pretty_print(const char *name, SVN_ERR(cancel_func(NULL)); - value = svn__apr_hash_index_val(hi); + value = apr_hash_this_val(hi); SVN_ERR(svn_cmdline_printf(scratch_pool, "%s %" APR_UINT64_T_FMT " %s\n", name, value->refcount, svn_checksum_to_cstring_display(
