diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-08-05 16:22:51 +0000 |
| commit | cf46733632c7279a9fd0fe6ce26f9185a4ae82a9 (patch) | |
| tree | da27775a2161723ef342e91af41a8b51fedef405 /subversion/libsvn_wc/lock.c | |
| parent | bb0ef45f7c46b0ae221b26265ef98a768c33f820 (diff) | |
| download | subversion-tarball-master.tar.gz | |
subversion-1.9.7HEADsubversion-1.9.7master
Diffstat (limited to 'subversion/libsvn_wc/lock.c')
| -rw-r--r-- | subversion/libsvn_wc/lock.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/subversion/libsvn_wc/lock.c b/subversion/libsvn_wc/lock.c index 36fbb0e..2392c3f 100644 --- a/subversion/libsvn_wc/lock.c +++ b/subversion/libsvn_wc/lock.c @@ -1211,7 +1211,7 @@ open_anchor(svn_wc_adm_access_t **anchor_access, if (disjoint) { /* Switched or disjoint, so drop P_ACCESS. Don't close any - descendents, or we might blast the child. */ + descendants, or we might blast the child. */ err = close_single(p_access, FALSE /* preserve_lock */, pool); if (err) { @@ -1308,13 +1308,13 @@ do_close(svn_wc_adm_access_t *adm_access, /* Gather all the opened access batons from the DB. */ opened = svn_wc__db_temp_get_all_access(adm_access->db, scratch_pool); - /* Close any that are descendents of this baton. */ + /* Close any that are descendants of this baton. */ for (hi = apr_hash_first(scratch_pool, opened); 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)) @@ -1630,7 +1630,7 @@ svn_wc__acquire_write_lock_for_resolve(const char **lock_root_abspath, scratch_pool, scratch_pool)); /* It's possible for the required lock path to be an ancestor - of, a descendent of, or equal to, the obtained lock path. If + of, a descendant of, or equal to, the obtained lock path. If it's an ancestor we have to try again, otherwise the obtained lock will do. */ child = svn_dirent_skip_ancestor(required_abspath, obtained_abspath); @@ -1643,7 +1643,7 @@ svn_wc__acquire_write_lock_for_resolve(const char **lock_root_abspath, } else { - /* required should be a descendent of, or equal to, obtained */ + /* required should be a descendant of, or equal to, obtained */ SVN_ERR_ASSERT(!strcmp(required_abspath, obtained_abspath) || svn_dirent_skip_ancestor(obtained_abspath, required_abspath)); |