You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/03/11 21:18:31 UTC
svn commit: r922003 - in /subversion/trunk/subversion: include/
libsvn_client/ libsvn_fs_fs/ libsvn_ra/ libsvn_repos/ libsvn_subr/
libsvn_wc/ svn/ svnadmin/ svndumpfilter/ svnlook/ svnserve/ svnsync/
tests/libsvn_wc/
Author: hwright
Date: Thu Mar 11 20:18:30 2010
New Revision: 922003
URL: http://svn.apache.org/viewvc?rev=922003&view=rev
Log:
Make our standin apr hash retrieval functions private, and note that in both
the function name and header file.
* subversion/include/svn_types.h,
subversion/libsvn_subr/iter.c
(svn_apr_hash_index_key): Renamed to...
(svn__apr_hash_index_key): ...this.
(svn_apr_hash_index_klen, svn__apr_hash_index_klen): Same.
(svn_apr_hash_index_val, svn__apr_hash_index_val): Same.
* subversion/libsvn_ra/ra_loader.c,
subversion/libsvn_subr/mergeinfo.c,
subversion/tests/libsvn_wc/tree-conflict-data-test.c,
subversion/svndumpfilter/main.c,
subversion/svn/props.c,
subversion/svn/propget-cmd.c,
subversion/svn/log-cmd.c,
subversion/svn/status-cmd.c,
subversion/svnadmin/main.c,
subversion/libsvn_wc/adm_ops.c,
subversion/libsvn_wc/status.c,
subversion/libsvn_wc/update_editor.c,
subversion/libsvn_wc/lock.c,
subversion/libsvn_wc/old-and-busted.c,
subversion/libsvn_wc/tree_conflicts.c,
subversion/libsvn_wc/entries.c,
subversion/libsvn_wc/copy.c,
subversion/libsvn_wc/wc_db.c,
subversion/libsvn_wc/upgrade.c,
subversion/libsvn_client/externals.c,
subversion/libsvn_client/util.c,
subversion/libsvn_client/repos_diff.c,
subversion/libsvn_client/export.c,
subversion/libsvn_client/info.c,
subversion/libsvn_client/merge.c,
subversion/libsvn_client/prop_commands.c,
subversion/libsvn_client/ra.c,
subversion/libsvn_client/locking_commands.c,
subversion/libsvn_client/diff.c,
subversion/libsvn_client/mergeinfo.c,
subversion/libsvn_client/commit_util.c,
subversion/libsvn_client/add.c,
subversion/libsvn_client/commit.c,
subversion/svnlook/main.c,
subversion/svnsync/main.c,
subversion/svnsync/sync.c,
subversion/libsvn_repos/reporter.c,
subversion/svnserve/serve.c,
subversion/libsvn_fs_fs/tree.c,
subversion/libsvn_fs_fs/fs_fs.c,
subversion/libsvn_fs_fs/lock.c,
subversion/libsvn_fs_fs/dag.c,
subversion/libsvn_fs_fs/caching.c:
Update callers throughout.
Modified:
subversion/trunk/subversion/include/svn_types.h
subversion/trunk/subversion/libsvn_client/add.c
subversion/trunk/subversion/libsvn_client/commit.c
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/diff.c
subversion/trunk/subversion/libsvn_client/export.c
subversion/trunk/subversion/libsvn_client/externals.c
subversion/trunk/subversion/libsvn_client/info.c
subversion/trunk/subversion/libsvn_client/locking_commands.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_client/prop_commands.c
subversion/trunk/subversion/libsvn_client/ra.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_client/util.c
subversion/trunk/subversion/libsvn_fs_fs/caching.c
subversion/trunk/subversion/libsvn_fs_fs/dag.c
subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
subversion/trunk/subversion/libsvn_fs_fs/lock.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_repos/reporter.c
subversion/trunk/subversion/libsvn_subr/iter.c
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/lock.c
subversion/trunk/subversion/libsvn_wc/old-and-busted.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/svn/log-cmd.c
subversion/trunk/subversion/svn/propget-cmd.c
subversion/trunk/subversion/svn/props.c
subversion/trunk/subversion/svn/status-cmd.c
subversion/trunk/subversion/svnadmin/main.c
subversion/trunk/subversion/svndumpfilter/main.c
subversion/trunk/subversion/svnlook/main.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/svnsync/main.c
subversion/trunk/subversion/svnsync/sync.c
subversion/trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c
Modified: subversion/trunk/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Thu Mar 11 20:18:30 2010
@@ -114,20 +114,22 @@ typedef struct svn_error_t
/** @defgroup apr_hash_utilities APR Hash Table Helpers
* These functions enable the caller to dereference an APR hash table index
* without type casts or temporary variables.
+ *
+ * ### These are private, and may go away when APR implements them natively.
* @{
*/
/** Return the key of the hash table entry indexed by @a hi. */
const void *
-svn_apr_hash_index_key(const apr_hash_index_t *hi);
+svn__apr_hash_index_key(const apr_hash_index_t *hi);
/** Return the key length of the hash table entry indexed by @a hi. */
apr_ssize_t
-svn_apr_hash_index_klen(const apr_hash_index_t *hi);
+svn__apr_hash_index_klen(const apr_hash_index_t *hi);
/** Return the value of the hash table entry indexed by @a hi. */
void *
-svn_apr_hash_index_val(const apr_hash_index_t *hi);
+svn__apr_hash_index_val(const apr_hash_index_t *hi);
/** @} */
Modified: subversion/trunk/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/add.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/add.c (original)
+++ subversion/trunk/subversion/libsvn_client/add.c Thu Mar 11 20:18:30 2010
@@ -312,8 +312,8 @@ add_file(const char *local_abspath,
for (hi = apr_hash_first(pool, properties);
hi != NULL; 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 = svn__apr_hash_index_key(hi);
+ const svn_string_t *pval = svn__apr_hash_index_val(hi);
svn_error_t *err;
/* It's probably best to pass 0 for force, so that if
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Thu Mar 11 20:18:30 2010
@@ -221,8 +221,8 @@ import_file(const svn_delta_editor_t *ed
{
for (hi = apr_hash_first(pool, properties); 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 = svn__apr_hash_index_key(hi);
+ const svn_string_t *pval = svn__apr_hash_index_val(hi);
SVN_ERR(editor->change_file_prop(file_baton, pname, pval, pool));
}
@@ -315,8 +315,8 @@ import_dir(const svn_delta_editor_t *edi
for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi))
{
const char *this_path, *this_edit_path, *abs_path;
- const char *filename = svn_apr_hash_index_key(hi);
- const svn_io_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ const char *filename = svn__apr_hash_index_key(hi);
+ const svn_io_dirent_t *dirent = svn__apr_hash_index_val(hi);
svn_pool_clear(subpool);
@@ -818,7 +818,7 @@ remove_tmpfiles(apr_hash_t *tempfiles,
/* Clean up any tempfiles. */
for (hi = apr_hash_first(pool, tempfiles); hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
+ const char *path = svn__apr_hash_index_key(hi);
svn_pool_clear(subpool);
@@ -914,8 +914,8 @@ collect_lock_tokens(apr_hash_t **result,
for (hi = apr_hash_first(pool, all_tokens); hi; hi = apr_hash_next(hi))
{
- const char *url = svn_apr_hash_index_key(hi);
- const char *token = svn_apr_hash_index_val(hi);
+ const char *url = svn__apr_hash_index_key(hi);
+ const char *token = svn__apr_hash_index_val(hi);
if (strncmp(base_url, url, base_len) == 0
&& (url[base_len] == '\0' || url[base_len] == '/'))
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Mar 11 20:18:30 2010
@@ -163,7 +163,7 @@ look_up_committable(apr_hash_t *committa
for (hi = apr_hash_first(pool, committables); hi; hi = apr_hash_next(hi))
{
- apr_array_header_t *these_committables = svn_apr_hash_index_val(hi);
+ apr_array_header_t *these_committables = svn__apr_hash_index_val(hi);
int i;
for (i = 0; i < these_committables->nelts; i++)
@@ -257,7 +257,7 @@ bail_on_tree_conflicted_children(svn_wc_
for (hi = apr_hash_first(pool, conflicts); hi; hi = apr_hash_next(hi))
{
const svn_wc_conflict_description_t *conflict =
- svn_apr_hash_index_val(hi);
+ svn__apr_hash_index_val(hi);
if ((conflict->node_kind == svn_node_dir) &&
(depth == svn_depth_files))
@@ -1636,7 +1636,7 @@ svn_client__do_commit(const char *base_u
/* Transmit outstanding text deltas. */
for (hi = apr_hash_first(pool, file_mods); hi; hi = apr_hash_next(hi))
{
- struct file_mod_t *mod = svn_apr_hash_index_val(hi);
+ struct file_mod_t *mod = svn__apr_hash_index_val(hi);
svn_client_commit_item3_t *item;
void *file_baton;
const char *tempfile;
Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Thu Mar 11 20:18:30 2010
@@ -126,8 +126,8 @@ display_mergeinfo_diff(const char *old_m
for (hi = apr_hash_first(pool, deleted);
hi; hi = apr_hash_next(hi))
{
- const char *from_path = svn_apr_hash_index_key(hi);
- apr_array_header_t *merge_revarray = svn_apr_hash_index_val(hi);
+ const char *from_path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *merge_revarray = svn__apr_hash_index_val(hi);
svn_string_t *merge_revstr;
SVN_ERR(svn_rangelist_to_string(&merge_revstr, merge_revarray, pool));
@@ -141,8 +141,8 @@ display_mergeinfo_diff(const char *old_m
for (hi = apr_hash_first(pool, added);
hi; hi = apr_hash_next(hi))
{
- const char *from_path = svn_apr_hash_index_key(hi);
- apr_array_header_t *merge_revarray = svn_apr_hash_index_val(hi);
+ const char *from_path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *merge_revarray = svn__apr_hash_index_val(hi);
svn_string_t *merge_revstr;
SVN_ERR(svn_rangelist_to_string(&merge_revstr, merge_revarray, pool));
Modified: subversion/trunk/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Thu Mar 11 20:18:30 2010
@@ -988,8 +988,8 @@ svn_client_export5(svn_revnum_t *result_
* with information. */
for (hi = apr_hash_first(pool, 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 = svn__apr_hash_index_key(hi);
+ const svn_string_t *propval = svn__apr_hash_index_val(hi);
SVN_ERR(change_file_prop(fb, propname, propval, pool));
}
Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Thu Mar 11 20:18:30 2010
@@ -1321,8 +1321,8 @@ svn_client__do_external_status(apr_hash_
hi = apr_hash_next(hi))
{
apr_array_header_t *exts;
- const char *path = svn_apr_hash_index_key(hi);
- const char *propval = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ const char *propval = svn__apr_hash_index_val(hi);
apr_pool_t *iterpool;
int i;
Modified: subversion/trunk/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Thu Mar 11 20:18:30 2010
@@ -219,8 +219,8 @@ push_dir_info(svn_ra_session_t *ra_sessi
{
const char *path, *URL, *fs_path;
svn_lock_t *lock;
- const char *name = svn_apr_hash_index_key(hi);
- svn_dirent_t *the_ent = svn_apr_hash_index_val(hi);
+ const char *name = svn__apr_hash_index_key(hi);
+ svn_dirent_t *the_ent = svn__apr_hash_index_val(hi);
svn_pool_clear(subpool);
Modified: subversion/trunk/subversion/libsvn_client/locking_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/locking_commands.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/locking_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/locking_commands.c Thu Mar 11 20:18:30 2010
@@ -362,7 +362,7 @@ fetch_tokens(svn_ra_session_t *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 = svn__apr_hash_index_key(hi);
svn_lock_t *lock;
svn_pool_clear(iterpool);
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Mar 11 20:18:30 2010
@@ -694,8 +694,8 @@ split_mergeinfo_on_revision(svn_mergeinf
for (hi = apr_hash_first(pool, *mergeinfo); hi; hi = apr_hash_next(hi))
{
int i;
- const char *merge_source_path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *merge_source_path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
@@ -903,8 +903,8 @@ filter_self_referential_mergeinfo(apr_ar
hi; hi = apr_hash_next(hi))
{
int j;
- const char *source_path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *source_path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
const char *merge_source_url;
apr_array_header_t *adjusted_rangelist =
apr_array_make(pool, 0, sizeof(svn_merge_range_t *));
@@ -3960,7 +3960,7 @@ find_gaps_in_merge_source_history(svn_re
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *value = svn_apr_hash_index_val(hi);
+ apr_array_header_t *value = svn__apr_hash_index_val(hi);
SVN_ERR(svn_rangelist_merge(&implicit_rangelist, value,
scratch_pool));
@@ -4290,8 +4290,8 @@ update_wc_mergeinfo(const char *target_a
the WC with its on-disk mergeinfo. */
for (hi = apr_hash_first(scratch_pool, merges); hi; hi = apr_hash_next(hi))
{
- const char *local_abspath = svn_apr_hash_index_key(hi);
- apr_array_header_t *ranges = svn_apr_hash_index_val(hi);
+ const char *local_abspath = svn__apr_hash_index_key(hi);
+ apr_array_header_t *ranges = svn__apr_hash_index_val(hi);
apr_array_header_t *rangelist;
svn_error_t *err;
const char *local_abspath_rel_to_target;
@@ -4430,7 +4430,7 @@ record_skips(const char *mergeinfo_path,
for (hi = apr_hash_first(pool, notify_b->skipped_abspaths); hi;
hi = apr_hash_next(hi))
{
- const char *skipped_abspath = svn_apr_hash_index_key(hi);
+ const char *skipped_abspath = svn__apr_hash_index_key(hi);
svn_wc_status2_t *status;
/* Before we override, make sure this is a versioned path, it
@@ -6629,7 +6629,7 @@ process_children_with_new_mergeinfo(merg
hi;
hi = apr_hash_next(hi))
{
- const char *abspath_with_new_mergeinfo = svn_apr_hash_index_key(hi);
+ const char *abspath_with_new_mergeinfo = svn__apr_hash_index_key(hi);
const char *old_session_url = NULL;
const char *path_url;
svn_mergeinfo_t path_inherited_mergeinfo;
@@ -6750,7 +6750,7 @@ path_is_subtree(const char *local_abspat
hi;
hi = apr_hash_next(hi))
{
- const char *path_touched_by_merge = svn_apr_hash_index_key(hi);
+ const char *path_touched_by_merge = svn__apr_hash_index_key(hi);
if (svn_dirent_is_ancestor(local_abspath, path_touched_by_merge))
return TRUE;
}
@@ -7098,7 +7098,7 @@ record_mergeinfo_for_added_subtrees(
for (hi = apr_hash_first(pool, notify_b->added_abspaths); hi;
hi = apr_hash_next(hi))
{
- const char *added_abspath = svn_apr_hash_index_key(hi);
+ const char *added_abspath = svn__apr_hash_index_key(hi);
const char *dir_abspath;
svn_mergeinfo_t parent_mergeinfo;
svn_boolean_t inherited; /* used multiple times, but ignored */
@@ -7240,7 +7240,7 @@ log_noop_revs(void *baton,
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
+ const char *path = svn__apr_hash_index_key(hi);
const char *rel_path;
const char *cwmi_path;
apr_array_header_t *paths_explicit_rangelist = NULL;
@@ -8690,7 +8690,7 @@ log_find_operative_revs(void *baton,
hi = apr_hash_next(hi))
{
const char *subtree_missing_this_rev;
- const char *path = svn_apr_hash_index_key(hi);
+ const char *path = svn__apr_hash_index_key(hi);
const char *rel_path;
const char *source_rel_path;
svn_boolean_t in_catalog;
@@ -8819,7 +8819,7 @@ find_unsynced_ranges(const char *source_
hi_catalog;
hi_catalog = apr_hash_next(hi_catalog))
{
- svn_mergeinfo_t mergeinfo = svn_apr_hash_index_val(hi_catalog);
+ svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi_catalog);
apr_hash_index_t *hi_mergeinfo;
for (hi_mergeinfo = apr_hash_first(scratch_pool, mergeinfo);
@@ -8827,7 +8827,7 @@ find_unsynced_ranges(const char *source_
hi_mergeinfo = apr_hash_next(hi_mergeinfo))
{
apr_array_header_t *rangelist =
- svn_apr_hash_index_val(hi_mergeinfo);
+ svn__apr_hash_index_val(hi_mergeinfo);
SVN_ERR(svn_rangelist_merge(&potentially_unmerged_ranges,
rangelist, scratch_pool));
@@ -8950,8 +8950,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_array_header_t *segments = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *segments = svn__apr_hash_index_val(hi);
const char *source_path;
svn_mergeinfo_t source_mergeinfo, filtered_mergeinfo;
@@ -9097,8 +9097,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
hi;
hi = apr_hash_next(hi))
{
- const char *source_path = svn_apr_hash_index_key(hi);
- svn_mergeinfo_t source_mergeinfo = svn_apr_hash_index_val(hi);
+ const char *source_path = svn__apr_hash_index_key(hi);
+ svn_mergeinfo_t source_mergeinfo = svn__apr_hash_index_val(hi);
svn_mergeinfo_t filtered_mergeinfo;
const char *target_path;
apr_array_header_t *segments;
@@ -9276,7 +9276,7 @@ calculate_left_hand_side(const char **ur
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
+ const char *path = svn__apr_hash_index_key(hi);
SVN_ERR(svn_client__repos_location_segments(&segments,
ra_session,
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Thu Mar 11 20:18:30 2010
@@ -151,8 +151,8 @@ svn_client__adjust_mergeinfo_source_path
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- const char *merge_source = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *merge_source = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
/* Copy inherited mergeinfo into our output hash, adjusting the
merge source as appropriate. */
@@ -460,7 +460,7 @@ svn_client__get_repos_mergeinfo(svn_ra_s
descendants. So if there is anything in the catalog it is the
mergeinfo for REL_PATH. */
*target_mergeinfo =
- svn_apr_hash_index_val(apr_hash_first(pool, tgt_mergeinfo_cat));
+ svn__apr_hash_index_val(apr_hash_first(pool, tgt_mergeinfo_cat));
}
@@ -532,7 +532,7 @@ svn_client__get_wc_or_repos_mergeinfo(sv
so we can peek into our catalog, but it ought to be the only
thing in the catalog, so we'll just fetch the first hash item. */
*target_mergeinfo =
- svn_apr_hash_index_val(apr_hash_first(pool, tgt_mergeinfo_cat));
+ svn__apr_hash_index_val(apr_hash_first(pool, tgt_mergeinfo_cat));
}
@@ -1348,8 +1348,8 @@ filter_log_entry_with_rangelist(void *ba
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- svn_log_changed_path2_t *change = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ svn_log_changed_path2_t *change = svn__apr_hash_index_val(hi);
const char *target_path_affected;
svn_mergeinfo_t nearest_ancestor_mergeinfo;
apr_hash_index_t *hi2;
@@ -1397,7 +1397,7 @@ filter_log_entry_with_rangelist(void *ba
hi2;
hi2 = apr_hash_next(hi2))
{
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi2);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi2);
SVN_ERR(svn_rangelist_intersect(&intersection, rangelist,
this_rev_rangelist, FALSE,
iterpool));
@@ -1495,13 +1495,13 @@ logs_for_mergeinfo_rangelist(const char
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
+ const char *path = svn__apr_hash_index_key(hi);
if (!svn_dirent_is_absolute(path))
apr_hash_set(rekeyed_catalog,
svn_dirent_join("/", path, scratch_pool),
APR_HASH_KEY_STRING,
- svn_apr_hash_index_val(hi));
+ svn__apr_hash_index_val(hi));
}
target_mergeinfo_catalog = rekeyed_catalog;
}
@@ -1633,8 +1633,8 @@ svn_client_mergeinfo_get_merged(apr_hash
full_path_mergeinfo = apr_hash_make(pool);
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- const char *key = svn_apr_hash_index_key(hi);
- void *val = svn_apr_hash_index_val(hi);
+ const char *key = svn__apr_hash_index_key(hi);
+ void *val = svn__apr_hash_index_val(hi);
const char *source_url;
source_url = svn_path_uri_encode(key, pool);
@@ -1772,14 +1772,14 @@ svn_client_mergeinfo_log(const char *pat
hi_catalog = apr_hash_next(hi_catalog))
{
svn_mergeinfo_t subtree_mergeinfo =
- svn_apr_hash_index_val(hi_catalog);
+ svn__apr_hash_index_val(hi_catalog);
svn_mergeinfo_t subtree_history;
svn_mergeinfo_t subtree_source_history;
svn_mergeinfo_t subtree_inheritable_mergeinfo;
svn_mergeinfo_t subtree_noninheritable_mergeinfo;
svn_mergeinfo_t merged_noninheritable;
svn_mergeinfo_t merged;
- const char *subtree_path = svn_apr_hash_index_key(hi_catalog);
+ const char *subtree_path = svn__apr_hash_index_key(hi_catalog);
svn_boolean_t is_subtree = strcmp(subtree_path,
path_or_url_repos_rel) != 0;
svn_pool_clear(iterpool);
@@ -1853,7 +1853,7 @@ svn_client_mergeinfo_log(const char *pat
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *list = svn_apr_hash_index_val(hi);
+ apr_array_header_t *list = svn__apr_hash_index_val(hi);
SVN_ERR(svn_rangelist_merge(
&master_noninheritable_rangelist,
svn_rangelist_dup(list, scratch_pool),
@@ -1881,7 +1881,7 @@ svn_client_mergeinfo_log(const char *pat
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *list = svn_apr_hash_index_val(hi);
+ apr_array_header_t *list = svn__apr_hash_index_val(hi);
SVN_ERR(svn_rangelist_merge(&master_inheritable_rangelist,
svn_rangelist_dup(list,
@@ -1927,7 +1927,7 @@ svn_client_mergeinfo_log(const char *pat
apr_array_header_t *deleted_rangelist;
apr_array_header_t *added_rangelist;
apr_array_header_t *subtree_merged_rangelist =
- svn_apr_hash_index_val(hi);
+ svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
@@ -1970,7 +1970,7 @@ svn_client_mergeinfo_log(const char *pat
hi = apr_hash_next(hi))
{
apr_array_header_t *subtree_merged_rangelist =
- svn_apr_hash_index_val(hi);
+ svn__apr_hash_index_val(hi);
SVN_ERR(svn_rangelist_merge(&source_master_rangelist,
subtree_merged_rangelist,
@@ -2017,9 +2017,9 @@ svn_client_mergeinfo_log(const char *pat
hi;
hi = apr_hash_next(hi))
{
- const char *key = svn_apr_hash_index_key(hi);
+ const char *key = svn__apr_hash_index_key(hi);
apr_array_header_t *subtree_merged_rangelist =
- svn_apr_hash_index_val(hi);
+ svn__apr_hash_index_val(hi);
apr_array_header_t *intersecting_rangelist;
svn_pool_clear(iterpool);
SVN_ERR(svn_rangelist_intersect(&intersecting_rangelist,
@@ -2099,7 +2099,7 @@ svn_client_suggest_merge_sources(apr_arr
/* We asked only for the PATH_OR_URL's mergeinfo, not any of its
descendants. So if there is anything in the catalog it is the
mergeinfo for PATH_OR_URL. */
- mergeinfo = svn_apr_hash_index_val(apr_hash_first(pool, mergeinfo_cat));
+ mergeinfo = svn__apr_hash_index_val(apr_hash_first(pool, mergeinfo_cat));
}
else
{
@@ -2119,7 +2119,7 @@ svn_client_suggest_merge_sources(apr_arr
{
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- const char *rel_path = svn_apr_hash_index_key(hi);
+ const char *rel_path = svn__apr_hash_index_key(hi);
if (copyfrom_path == NULL || strcmp(rel_path, copyfrom_path) != 0)
APR_ARRAY_PUSH(list, const char *) = \
Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Thu Mar 11 20:18:30 2010
@@ -711,8 +711,8 @@ remote_propget(apr_hash_t *props,
hi;
hi = apr_hash_next(hi))
{
- const char *this_name = svn_apr_hash_index_key(hi);
- svn_dirent_t *this_ent = svn_apr_hash_index_val(hi);
+ const char *this_name = svn__apr_hash_index_key(hi);
+ svn_dirent_t *this_ent = svn__apr_hash_index_val(hi);
const char *new_target_relative;
svn_depth_t depth_below_here = depth;
@@ -1008,9 +1008,9 @@ remote_proplist(const char *target_prefi
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 = 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);
svn_prop_kind_t prop_kind;
prop_kind = svn_property_kind(NULL, name);
@@ -1036,8 +1036,8 @@ remote_proplist(const char *target_prefi
hi;
hi = apr_hash_next(hi))
{
- const char *this_name = svn_apr_hash_index_key(hi);
- svn_dirent_t *this_ent = svn_apr_hash_index_val(hi);
+ const char *this_name = svn__apr_hash_index_key(hi);
+ svn_dirent_t *this_ent = svn__apr_hash_index_val(hi);
const char *new_target_relative;
svn_pool_clear(subpool);
Modified: subversion/trunk/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Thu Mar 11 20:18:30 2010
@@ -754,9 +754,9 @@ svn_client__get_youngest_common_ancestor
remembering the youngest matching location. */
for (hi = apr_hash_first(pool, history1); hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_ssize_t path_len = svn_apr_hash_index_klen(hi);
- apr_array_header_t *ranges1 = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_ssize_t path_len = svn__apr_hash_index_klen(hi);
+ apr_array_header_t *ranges1 = svn__apr_hash_index_val(hi);
apr_array_header_t *ranges2, *common;
ranges2 = apr_hash_get(history2, path, path_len);
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Thu Mar 11 20:18:30 2010
@@ -991,8 +991,8 @@ close_directory(void *dir_baton,
for (hi = apr_hash_first(pool, eb->deleted_paths); hi;
hi = apr_hash_next(hi))
{
- const char *deleted_path = svn_apr_hash_index_key(hi);
- deleted_path_notify_t *dpn = svn_apr_hash_index_val(hi);
+ const char *deleted_path = svn__apr_hash_index_key(hi);
+ deleted_path_notify_t *dpn = svn__apr_hash_index_val(hi);
notify = svn_wc_create_notify(deleted_path, dpn->action, pool);
notify->kind = dpn->kind;
Modified: subversion/trunk/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Thu Mar 11 20:18:30 2010
@@ -50,9 +50,9 @@ string_hash_dup(apr_hash_t *hash, apr_po
for (hi = apr_hash_first(pool, hash); hi; hi = apr_hash_next(hi))
{
- const char *key = apr_pstrdup(pool, svn_apr_hash_index_key(hi));
- apr_ssize_t klen = svn_apr_hash_index_klen(hi);
- svn_string_t *val = svn_string_dup(svn_apr_hash_index_val(hi), pool);
+ const char *key = apr_pstrdup(pool, svn__apr_hash_index_key(hi));
+ apr_ssize_t klen = svn__apr_hash_index_klen(hi);
+ svn_string_t *val = svn_string_dup(svn__apr_hash_index_val(hi), pool);
apr_hash_set(new_hash, key, klen, val);
}
Modified: subversion/trunk/subversion/libsvn_fs_fs/caching.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/caching.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/caching.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/caching.c Thu Mar 11 20:18:30 2010
@@ -93,7 +93,7 @@ dup_dir_listing(void **out,
for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi))
{
- svn_fs_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ svn_fs_dirent_t *dirent = svn__apr_hash_index_val(hi);
svn_fs_dirent_t *new_dirent;
new_dirent = apr_palloc(pool, sizeof(*new_dirent));
Modified: subversion/trunk/subversion/libsvn_fs_fs/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/dag.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/dag.c Thu Mar 11 20:18:30 2010
@@ -844,7 +844,7 @@ svn_fs_fs__dag_delete_if_mutable(svn_fs_
hi;
hi = apr_hash_next(hi))
{
- svn_fs_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ svn_fs_dirent_t *dirent = svn__apr_hash_index_val(hi);
SVN_ERR(svn_fs_fs__dag_delete_if_mutable(fs, dirent->id,
pool));
Modified: subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/fs_fs.c Thu Mar 11 20:18:30 2010
@@ -3554,7 +3554,7 @@ unparse_dir_entries(apr_hash_t **str_ent
{
const void *key;
apr_ssize_t klen;
- svn_fs_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ svn_fs_dirent_t *dirent = svn__apr_hash_index_val(hi);
const char *new_val;
apr_hash_this(hi, &key, &klen, NULL);
@@ -3602,8 +3602,8 @@ parse_dir_entries(apr_hash_t **entries_p
/* Translate the string dir entries into real entries. */
for (hi = apr_hash_first(pool, str_entries); hi; hi = apr_hash_next(hi))
{
- const char *name = svn_apr_hash_index_key(hi);
- svn_string_t *str_val = svn_apr_hash_index_val(hi);
+ const char *name = svn__apr_hash_index_key(hi);
+ svn_string_t *str_val = svn__apr_hash_index_val(hi);
char *str, *last_str;
svn_fs_dirent_t *dirent = apr_pcalloc(pool, sizeof(*dirent));
@@ -4199,8 +4199,8 @@ fetch_all_changes(apr_hash_t *changed_pa
hi = apr_hash_next(hi))
{
/* KEY is the path. */
- const char *path = svn_apr_hash_index_key(hi);
- apr_ssize_t klen = svn_apr_hash_index_klen(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_ssize_t klen = svn__apr_hash_index_klen(hi);
/* If we come across our own path, ignore it. */
if (strcmp(change->path, path) == 0)
@@ -5513,7 +5513,7 @@ write_final_rev(const svn_fs_id_t **new_
for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi))
{
- svn_fs_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ svn_fs_dirent_t *dirent = svn__apr_hash_index_val(hi);
svn_pool_clear(subpool);
SVN_ERR(write_final_rev(&new_id, file, rev, fs, dirent->id,
@@ -5663,8 +5663,8 @@ write_final_changed_path_info(apr_off_t
svn_pool_clear(iterpool);
- change = svn_apr_hash_index_val(hi);
- path = svn_apr_hash_index_key(hi);
+ change = svn__apr_hash_index_val(hi);
+ path = svn__apr_hash_index_key(hi);
id = change->node_rev_id;
@@ -5799,7 +5799,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 *) = svn__apr_hash_index_key(hi);
qsort(changed_paths->elts, changed_paths->nelts,
changed_paths->elt_size, svn_sort_compare_paths);
@@ -6606,7 +6606,7 @@ recover_find_max_ids(svn_fs_t *fs, svn_r
svn_fs_id_t *id;
const char *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 = svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
@@ -7033,8 +7033,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 = svn__apr_hash_index_key(hi);
+ apr_ssize_t klen = svn__apr_hash_index_klen(hi);
const char *id;
/* The name must end with ".txn" to be considered a transaction. */
Modified: subversion/trunk/subversion/libsvn_fs_fs/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/lock.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/lock.c Thu Mar 11 20:18:30 2010
@@ -190,8 +190,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));
+ svn__apr_hash_index_key(hi),
+ svn__apr_hash_index_klen(hi));
svn_stringbuf_appendbytes(children_list, "\n", 1);
}
hash_store(hash, CHILDREN_KEY, sizeof(CHILDREN_KEY)-1,
@@ -559,7 +559,7 @@ walk_digest_files(svn_fs_t *fs,
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 = svn__apr_hash_index_key(hi);
svn_pool_clear(subpool);
SVN_ERR(walk_digest_files
(fs, digest_path_from_digest(fs, digest, subpool),
Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Thu Mar 11 20:18:30 2010
@@ -1380,9 +1380,9 @@ merge(svn_stringbuf_t *conflict_p,
svn_pool_clear(iterpool);
- name = svn_apr_hash_index_key(hi);
- klen = svn_apr_hash_index_klen(hi);
- a_entry = svn_apr_hash_index_val(hi);
+ name = svn__apr_hash_index_key(hi);
+ klen = svn__apr_hash_index_klen(hi);
+ a_entry = svn__apr_hash_index_val(hi);
s_entry = apr_hash_get(s_entries, name, klen);
t_entry = apr_hash_get(t_entries, name, klen);
@@ -1510,13 +1510,13 @@ merge(svn_stringbuf_t *conflict_p,
hi = apr_hash_next(hi))
{
svn_fs_dirent_t *s_entry, *t_entry;
- const char *name = svn_apr_hash_index_key(hi);
- apr_ssize_t klen = svn_apr_hash_index_klen(hi);
+ const char *name = svn__apr_hash_index_key(hi);
+ apr_ssize_t klen = svn__apr_hash_index_klen(hi);
dag_node_t *s_ent_node;
svn_pool_clear(iterpool);
- s_entry = svn_apr_hash_index_val(hi);
+ s_entry = svn__apr_hash_index_val(hi);
t_entry = apr_hash_get(t_entries, name, klen);
/* If NAME exists in TARGET, declare a conflict. */
@@ -3410,7 +3410,7 @@ crawl_directory_dag_for_mergeinfo(svn_fs
hi;
hi = apr_hash_next(hi))
{
- svn_fs_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ svn_fs_dirent_t *dirent = svn__apr_hash_index_val(hi);
const char *kid_path;
dag_node_t *kid_dag;
svn_boolean_t has_mergeinfo, go_down;
@@ -3482,8 +3482,8 @@ append_to_merged_froms(svn_mergeinfo_t *
for (hi = apr_hash_first(pool, input); hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
char *newpath;
newpath = svn_uri_join(path, path_piece, pool);
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Thu Mar 11 20:18:30 2010
@@ -971,7 +971,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 = svn__apr_hash_index_key(hi);
SVN_ERR_ASSERT(*path != '/');
}
@@ -996,7 +996,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 = svn__apr_hash_index_key(hi);
SVN_ERR_ASSERT(*path != '/');
}
Modified: subversion/trunk/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/reporter.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/reporter.c (original)
+++ subversion/trunk/subversion/libsvn_repos/reporter.c Thu Mar 11 20:18:30 2010
@@ -1056,7 +1056,7 @@ delta_dirs(report_baton_t *b, svn_revnum
const svn_fs_dirent_t *s_entry;
svn_pool_clear(subpool);
- s_entry = svn_apr_hash_index_val(hi);
+ s_entry = svn__apr_hash_index_val(hi);
if (apr_hash_get(t_entries, s_entry->name,
APR_HASH_KEY_STRING) == NULL)
@@ -1094,7 +1094,7 @@ delta_dirs(report_baton_t *b, svn_revnum
const svn_fs_dirent_t *s_entry, *t_entry;
svn_pool_clear(subpool);
- t_entry = svn_apr_hash_index_val(hi);
+ t_entry = svn__apr_hash_index_val(hi);
if (is_depth_upgrade(wc_depth, requested_depth, t_entry->kind))
{
Modified: subversion/trunk/subversion/libsvn_subr/iter.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/iter.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/iter.c (original)
+++ subversion/trunk/subversion/libsvn_subr/iter.c Thu Mar 11 20:18:30 2010
@@ -132,7 +132,7 @@ svn_iter__break(void)
* So these functions all take const hash indices, and we cast the const
* away when passing them down to APR to avoid compiler warnings. */
-const void *svn_apr_hash_index_key(const apr_hash_index_t *hi)
+const void *svn__apr_hash_index_key(const apr_hash_index_t *hi)
{
const void *key;
@@ -140,7 +140,7 @@ const void *svn_apr_hash_index_key(const
return key;
}
-apr_ssize_t svn_apr_hash_index_klen(const apr_hash_index_t *hi)
+apr_ssize_t svn__apr_hash_index_klen(const apr_hash_index_t *hi)
{
apr_ssize_t klen;
@@ -148,7 +148,7 @@ apr_ssize_t svn_apr_hash_index_klen(cons
return klen;
}
-void *svn_apr_hash_index_val(const apr_hash_index_t *hi)
+void *svn__apr_hash_index_val(const apr_hash_index_t *hi)
{
void *val;
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Thu Mar 11 20:18:30 2010
@@ -849,7 +849,7 @@ svn_mergeinfo__set_inheritance(svn_merge
hi = apr_hash_next(hi))
{
apr_array_header_t *rangelist;
- const char *path = svn_apr_hash_index_key(hi);
+ const char *path = svn__apr_hash_index_key(hi);
rangelist = apr_hash_get(mergeinfo, path, APR_HASH_KEY_STRING);
@@ -1309,8 +1309,8 @@ svn_mergeinfo_intersect2(svn_mergeinfo_t
for (hi = apr_hash_first(apr_hash_pool_get(mergeinfo1), mergeinfo1);
hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist1 = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist1 = svn__apr_hash_index_val(hi);
apr_array_header_t *rangelist2;
rangelist2 = apr_hash_get(mergeinfo2, path, APR_HASH_KEY_STRING);
@@ -1445,7 +1445,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 = svn__apr_hash_index_val(hi);
qsort(rl->elts, rl->nelts, rl->elt_size, svn_sort_compare_ranges);
}
@@ -1463,8 +1463,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 = svn__apr_hash_index_key(hi);
+ svn_mergeinfo_t val = svn__apr_hash_index_val(hi);
apr_hash_set(new_mergeinfo_catalog,
apr_pstrdup(pool, key),
@@ -1483,9 +1483,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);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_ssize_t pathlen = svn__apr_hash_index_klen(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
apr_hash_set(new_mergeinfo, apr_pstrmemdup(pool, path, pathlen), pathlen,
svn_rangelist_dup(rangelist, pool));
@@ -1511,9 +1511,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);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *key = svn__apr_hash_index_key(hi);
+ apr_ssize_t keylen = svn__apr_hash_index_klen(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
apr_array_header_t *inheritable_rangelist;
if (!path || svn_path_compare_paths(path, key) == 0)
@@ -1599,8 +1599,8 @@ svn_mergeinfo__remove_empty_rangelists(s
{
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist->nelts == 0)
{
@@ -1625,9 +1625,9 @@ 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);
- apr_ssize_t klen = svn_apr_hash_index_klen(hi);
- svn_mergeinfo_t *value = svn_apr_hash_index_val(hi);
+ const char *original_path = svn__apr_hash_index_key(hi);
+ apr_ssize_t klen = svn__apr_hash_index_klen(hi);
+ svn_mergeinfo_t *value = svn__apr_hash_index_val(hi);
SVN_ERR_ASSERT(klen >= prefix_len);
SVN_ERR_ASSERT(strncmp(original_path, prefix, prefix_len) == 0);
@@ -1661,8 +1661,8 @@ svn_mergeinfo__add_suffix_to_mergeinfo(s
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
apr_hash_set(*out_mergeinfo,
svn_dirent_join(path, canonical_suffix, result_pool),
@@ -1817,7 +1817,7 @@ svn_mergeinfo__get_range_endpoints(svn_r
for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist->nelts)
{
@@ -1854,8 +1854,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 = svn__apr_hash_index_key(hi);
+ svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi);
svn_mergeinfo_t filtered_mergeinfo;
SVN_ERR(svn_mergeinfo__filter_mergeinfo_by_ranges(&filtered_mergeinfo,
@@ -1897,8 +1897,8 @@ svn_mergeinfo__filter_mergeinfo_by_range
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
if (rangelist->nelts)
{
@@ -1931,7 +1931,7 @@ svn_mergeinfo__is_noninheritable(svn_mer
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
int i;
for (i = 0; i < rangelist->nelts; i++)
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 11 20:18:30 2010
@@ -950,7 +950,7 @@ erase_from_wc(svn_wc__db_t *db,
hi;
hi = apr_hash_next(hi))
{
- const char *name = svn_apr_hash_index_key(hi);
+ const char *name = svn__apr_hash_index_key(hi);
svn_pool_clear(iterpool);
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Thu Mar 11 20:18:30 2010
@@ -60,8 +60,8 @@ copy_props(svn_wc__db_t *db,
scratch_pool, scratch_pool));
for (hi = apr_hash_first(scratch_pool, props); 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 = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
SVN_ERR(svn_wc__internal_propset(db, dst_abspath, propname, propval,
FALSE /* skip_checks */,
@@ -188,8 +188,8 @@ copy_added_dir_administratively(svn_wc_c
hi;
hi = apr_hash_next(hi))
{
- const char *name = svn_apr_hash_index_key(hi);
- svn_io_dirent_t *dirent = svn_apr_hash_index_val(hi);
+ const char *name = svn__apr_hash_index_key(hi);
+ svn_io_dirent_t *dirent = svn__apr_hash_index_val(hi);
const char *node_abspath;
svn_wc__db_kind_t kind;
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Thu Mar 11 20:18:30 2010
@@ -1490,7 +1490,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)));
+ svn__apr_hash_index_val(hi)));
if (hidden)
break;
}
@@ -1508,8 +1508,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 = svn__apr_hash_index_key(hi);
+ const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi);
svn_boolean_t hidden;
SVN_ERR(svn_wc__entry_is_hidden(&hidden, entry));
@@ -2260,8 +2260,8 @@ entries_write_new_cb(void *baton,
for (hi = apr_hash_first(scratch_pool, ewb->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 = svn__apr_hash_index_key(hi);
+ const svn_wc_entry_t *this_entry = svn__apr_hash_index_val(hi);
const char *child_abspath;
svn_pool_clear(iterpool);
@@ -3197,8 +3197,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 = svn__apr_hash_index_key(hi);
+ const svn_wc_entry_t *current_entry = svn__apr_hash_index_val(hi);
const char *entrypath;
const char *entry_abspath;
svn_boolean_t hidden;
Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Thu Mar 11 20:18:30 2010
@@ -1384,8 +1384,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 = svn__apr_hash_index_key(hi);
+ svn_wc_adm_access_t *child = svn__apr_hash_index_val(hi);
const char *path = child->path;
if (IS_MISSING(child))
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=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/trunk/subversion/libsvn_wc/old-and-busted.c Thu Mar 11 20:18:30 2010
@@ -1171,7 +1171,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 = svn__apr_hash_index_val(hi);
if (this_entry == default_entry)
/* THIS_DIR already has all the information it can possibly
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Thu Mar 11 20:18:30 2010
@@ -722,7 +722,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 = svn__apr_hash_index_key(hi);
if (svn_dirent_is_child(local_abspath, external_abspath, NULL))
return TRUE;
@@ -1631,8 +1631,8 @@ handle_statii(struct edit_baton *eb,
/* Loop over all the statuses still in our hash, handling each one. */
for (hi = apr_hash_first(pool, statii); hi; hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- svn_wc_status2_t *status = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ svn_wc_status2_t *status = svn__apr_hash_index_val(hi);
/* Clear the subpool. */
svn_pool_clear(subpool);
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Thu Mar 11 20:18:30 2010
@@ -470,7 +470,7 @@ svn_wc__write_tree_conflicts(const char
{
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, svn__apr_hash_index_val(hi),
pool, pool));
svn_skel__prepend(c_skel, skel);
}
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Mar 11 20:18:30 2010
@@ -3723,8 +3723,8 @@ copy_regular_props(apr_hash_t *props_in,
for (hi = apr_hash_first(pool, props_in); 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 = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
if (svn_property_kind(NULL, propname) == svn_prop_regular_kind)
apr_hash_set(props_out, propname, APR_HASH_KEY_STRING, propval);
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Mar 11 20:18:30 2010
@@ -160,7 +160,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 = svn__apr_hash_index_key(hi);
svn_pool_clear(iterpool);
@@ -300,7 +300,7 @@ get_versioned_subdirs(apr_array_header_t
hi;
hi = apr_hash_next(hi))
{
- const char *name = svn_apr_hash_index_key(hi);
+ const char *name = svn__apr_hash_index_key(hi);
/* skip "this dir" */
if (*name == '\0')
@@ -694,7 +694,7 @@ migrate_single_tree_conflict_data(svn_sq
hi = apr_hash_next(hi))
{
const svn_wc_conflict_description2_t *conflict =
- svn_apr_hash_index_val(hi);
+ svn__apr_hash_index_val(hi);
const char *conflict_relpath;
apr_int64_t left_repos_id;
apr_int64_t right_repos_id;
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Mar 11 20:18:30 2010
@@ -364,7 +364,7 @@ close_many_wcroots(apr_hash_t *roots,
for (hi = apr_hash_first(scratch_pool, roots); hi; hi = apr_hash_next(hi))
{
- wcroot_t *wcroot = svn_apr_hash_index_val(hi);
+ wcroot_t *wcroot = svn__apr_hash_index_val(hi);
apr_status_t result;
result = apr_pool_cleanup_run(state_pool, wcroot, close_wcroot);
@@ -5158,8 +5158,8 @@ svn_wc__db_upgrade_apply_dav_cache(svn_s
hi;
hi = apr_hash_next(hi))
{
- const char *local_relpath = svn_apr_hash_index_key(hi);
- apr_hash_t *props = svn_apr_hash_index_val(hi);
+ const char *local_relpath = svn__apr_hash_index_key(hi);
+ apr_hash_t *props = svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
@@ -5610,8 +5610,8 @@ svn_wc__db_temp_get_all_access(svn_wc__d
hi;
hi = apr_hash_next(hi))
{
- const void *key = svn_apr_hash_index_key(hi);
- const svn_wc__db_pdh_t *pdh = svn_apr_hash_index_val(hi);
+ const void *key = svn__apr_hash_index_key(hi);
+ const svn_wc__db_pdh_t *pdh = svn__apr_hash_index_val(hi);
if (pdh->adm_access != NULL)
apr_hash_set(result, key, APR_HASH_KEY_STRING, pdh->adm_access);
@@ -5819,7 +5819,7 @@ svn_wc__db_read_conflict_victims(const a
hi = apr_hash_next(hi))
{
const char *child_name =
- svn_dirent_basename(svn_apr_hash_index_key(hi), result_pool);
+ svn_dirent_basename(svn__apr_hash_index_key(hi), result_pool);
/* Using a hash avoids duplicates */
apr_hash_set(found, child_name, APR_HASH_KEY_STRING, child_name);
Modified: subversion/trunk/subversion/svn/log-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/log-cmd.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/log-cmd.c (original)
+++ subversion/trunk/subversion/svn/log-cmd.c Thu Mar 11 20:18:30 2010
@@ -367,8 +367,8 @@ log_entry_receiver_xml(void *baton,
hi != NULL;
hi = apr_hash_next(hi))
{
- const char *path = svn_apr_hash_index_key(hi);
- svn_log_changed_path2_t *log_item = svn_apr_hash_index_val(hi);
+ const char *path = svn__apr_hash_index_key(hi);
+ svn_log_changed_path2_t *log_item = svn__apr_hash_index_val(hi);
char action[2];
action[0] = log_item->action;
@@ -545,8 +545,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 = svn__apr_hash_index_key(hi);
+ svn_string_t *value = svn__apr_hash_index_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=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/propget-cmd.c (original)
+++ subversion/trunk/subversion/svn/propget-cmd.c Thu Mar 11 20:18:30 2010
@@ -76,8 +76,8 @@ print_properties_xml(const char *pname,
for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi))
{
- const char *filename = svn_apr_hash_index_key(hi);
- svn_string_t *propval = svn_apr_hash_index_val(hi);
+ const char *filename = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
svn_stringbuf_t *sb = NULL;
svn_pool_clear(iterpool);
@@ -120,8 +120,8 @@ print_properties(svn_stream_t *out,
for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi))
{
- const char *filename = svn_apr_hash_index_key(hi);
- svn_string_t *propval = svn_apr_hash_index_val(hi);
+ const char *filename = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
svn_pool_clear(iterpool);
Modified: subversion/trunk/subversion/svn/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/props.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/props.c (original)
+++ subversion/trunk/subversion/svn/props.c Thu Mar 11 20:18:30 2010
@@ -90,8 +90,8 @@ svn_cl__print_prop_hash(apr_hash_t *prop
for (hi = apr_hash_first(pool, prop_hash); 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 = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
const char *pname_stdout;
if (svn_prop_needs_translation(pname))
@@ -131,8 +131,8 @@ svn_cl__print_xml_prop_hash(svn_stringbu
for (hi = apr_hash_first(pool, prop_hash); 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 = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
if (names_only)
{
Modified: subversion/trunk/subversion/svn/status-cmd.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status-cmd.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status-cmd.c (original)
+++ subversion/trunk/subversion/svn/status-cmd.c Thu Mar 11 20:18:30 2010
@@ -305,8 +305,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 = svn__apr_hash_index_key(hi);
+ apr_array_header_t *path_array = svn__apr_hash_index_val(hi);
int j;
/* ### TODO: For non-XML output, we shouldn't print the
Modified: subversion/trunk/subversion/svnadmin/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnadmin/main.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svnadmin/main.c (original)
+++ subversion/trunk/subversion/svnadmin/main.c Thu Mar 11 20:18:30 2010
@@ -1248,8 +1248,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 = svn__apr_hash_index_key(hi);
+ svn_lock_t *lock = svn__apr_hash_index_val(hi);
int comment_lines = 0;
cr_date = svn_time_to_human_cstring(lock->creation_date, pool);
Modified: subversion/trunk/subversion/svndumpfilter/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svndumpfilter/main.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svndumpfilter/main.c (original)
+++ subversion/trunk/subversion/svndumpfilter/main.c Thu Mar 11 20:18:30 2010
@@ -285,8 +285,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 = svn__apr_hash_index_key(hi);
+ const char *val = svn__apr_hash_index_val(hi);
if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH))
|| (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH))
@@ -351,8 +351,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 = svn__apr_hash_index_key(hi);
+ const svn_string_t *pval = svn__apr_hash_index_val(hi);
write_prop_to_stringbuf(&props, pname, pval);
}
@@ -550,8 +550,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 = svn__apr_hash_index_key(hi);
+ const char *val = svn__apr_hash_index_val(hi);
if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH))
|| (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH))
@@ -672,8 +672,8 @@ adjust_mergeinfo(svn_string_t **final_va
SVN_ERR(svn_mergeinfo_parse(&mergeinfo, initial_val->data, subpool));
for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi))
{
- const char *merge_source = svn_apr_hash_index_key(hi);
- apr_array_header_t *rangelist = svn_apr_hash_index_val(hi);
+ const char *merge_source = svn__apr_hash_index_key(hi);
+ apr_array_header_t *rangelist = svn__apr_hash_index_val(hi);
struct parse_baton_t *pb = rb->pb;
int i;
@@ -1132,7 +1132,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 = svn__apr_hash_index_key(hi);
APR_ARRAY_PUSH(keys, svn_revnum_t) = *revnum;
}
@@ -1176,7 +1176,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 = svn__apr_hash_index_key(hi);
APR_ARRAY_PUSH(keys, const char *) = path;
}
Modified: subversion/trunk/subversion/svnlook/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnlook/main.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svnlook/main.c (original)
+++ subversion/trunk/subversion/svnlook/main.c Thu Mar 11 20:18:30 2010
@@ -1218,7 +1218,7 @@ print_tree(svn_fs_root_t *root,
subpool = svn_pool_create(pool);
for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi))
{
- svn_fs_dirent_t *entry = svn_apr_hash_index_val(hi);
+ svn_fs_dirent_t *entry = svn__apr_hash_index_val(hi);
svn_pool_clear(subpool);
SVN_ERR(print_tree(root,
@@ -1729,8 +1729,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 = svn__apr_hash_index_key(hi);
+ svn_string_t *propval = svn__apr_hash_index_val(hi);
SVN_ERR(check_cancel(NULL));
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Thu Mar 11 20:18:30 2010
@@ -1430,8 +1430,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 = svn__apr_hash_index_key(hi);
+ svn_fs_dirent_t *fsent = svn__apr_hash_index_val(hi);
svn_dirent_t *entry;
svn_pool_clear(subpool);
@@ -1495,8 +1495,8 @@ static svn_error_t *get_dir(svn_ra_svn_c
{
for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi))
{
- const char *name = svn_apr_hash_index_key(hi);
- svn_dirent_t *entry = svn_apr_hash_index_val(hi);
+ const char *name = svn__apr_hash_index_key(hi);
+ svn_dirent_t *entry = svn__apr_hash_index_val(hi);
cdate = (entry->time == (time_t) -1) ? NULL
: svn_time_to_cstring(entry->time, pool);
@@ -1761,8 +1761,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 = svn__apr_hash_index_key(hi);
+ svn_mergeinfo_t value = svn__apr_hash_index_val(hi);
svn_string_t *mergeinfo_string;
svn_pool_clear(iterpool);
@@ -1810,8 +1810,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 = svn__apr_hash_index_key(h);
+ svn_log_changed_path2_t *change = svn__apr_hash_index_val(h);
action[0] = change->action;
action[1] = '\0';
@@ -2084,8 +2084,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 = svn__apr_hash_index_key(iter);
+ const char *iter_value = svn__apr_hash_index_val(iter);
SVN_ERR(svn_ra_svn_write_tuple(conn, pool, "rc",
*iter_key, iter_value));
@@ -2591,7 +2591,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 = svn__apr_hash_index_val(hi);
SVN_ERR(write_lock(conn, pool, l));
}
Modified: subversion/trunk/subversion/svnsync/main.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/main.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/main.c (original)
+++ subversion/trunk/subversion/svnsync/main.c Thu Mar 11 20:18:30 2010
@@ -437,7 +437,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 = svn__apr_hash_index_key(hi);
svn_pool_clear(subpool);
@@ -477,8 +477,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 = svn__apr_hash_index_key(hi);
+ void *propval = svn__apr_hash_index_val(hi);
/* Copy all properties:
- not matching the exclude pattern if provided OR
@@ -519,8 +519,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 = svn__apr_hash_index_key(hi);
+ const svn_string_t *propval = svn__apr_hash_index_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=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/sync.c (original)
+++ subversion/trunk/subversion/svnsync/sync.c Thu Mar 11 20:18:30 2010
@@ -100,8 +100,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 = svn__apr_hash_index_key(hi);
+ const svn_string_t *propval = svn__apr_hash_index_val(hi);
if (svn_prop_needs_translation(propname))
{
Modified: subversion/trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c?rev=922003&r1=922002&r2=922003&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/tree-conflict-data-test.c Thu Mar 11 20:18:30 2010
@@ -74,7 +74,7 @@ test_read_tree_conflict(apr_pool_t *pool
pool));
hi = apr_hash_first(pool, conflicts);
- conflict = svn_apr_hash_index_val(hi);
+ conflict = svn__apr_hash_index_val(hi);
if ((conflict->node_kind != exp_conflict->node_kind) ||
(conflict->action != exp_conflict->action) ||
@@ -120,7 +120,7 @@ test_read_2_tree_conflicts(apr_pool_t *p
pool));
hi = apr_hash_first(pool, conflicts);
- conflict1 = svn_apr_hash_index_val(hi);
+ conflict1 = svn__apr_hash_index_val(hi);
if ((conflict1->node_kind != exp_conflict1->node_kind) ||
(conflict1->action != exp_conflict1->action) ||
(conflict1->reason != exp_conflict1->reason) ||
@@ -129,7 +129,7 @@ test_read_2_tree_conflicts(apr_pool_t *p
return fail(pool, "Tree conflict struct #1 has bad data");
hi = apr_hash_next(hi);
- conflict2 = svn_apr_hash_index_val(hi);
+ conflict2 = svn__apr_hash_index_val(hi);
if ((conflict2->node_kind != exp_conflict2->node_kind) ||
(conflict2->action != exp_conflict2->action) ||
(conflict2->reason != exp_conflict2->reason) ||