diff options
author | Dimitry Andric <dim@FreeBSD.org> | 2020-05-31 20:58:28 +0000 |
---|---|---|
committer | Dimitry Andric <dim@FreeBSD.org> | 2020-05-31 20:58:28 +0000 |
commit | bbee6e0814d5875b85b81f26fd4ca7a28b6f9570 (patch) | |
tree | 726fcf32b39ca8976d7aa51b67c7236509f1bde4 /subversion/libsvn_fs_x/dag_cache.c | |
parent | 38cef28c88864beaadac7a7cffdec6da952c3eb2 (diff) | |
download | src-bbee6e0814d5875b85b81f26fd4ca7a28b6f9570.tar.gz src-bbee6e0814d5875b85b81f26fd4ca7a28b6f9570.zip |
Vendor import svn-1.14.0.vendor/subversion/subversion-1.14.0vendor/subversion
Notes
Notes:
svn path=/vendor/subversion/dist/; revision=361669
svn path=/vendor/subversion/subversion-1.14.0/; revision=361670; tag=vendor/subversion/subversion-1.14.0
Diffstat (limited to 'subversion/libsvn_fs_x/dag_cache.c')
-rw-r--r-- | subversion/libsvn_fs_x/dag_cache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subversion/libsvn_fs_x/dag_cache.c b/subversion/libsvn_fs_x/dag_cache.c index 896c56fb3203..34a0117fd599 100644 --- a/subversion/libsvn_fs_x/dag_cache.c +++ b/subversion/libsvn_fs_x/dag_cache.c @@ -807,7 +807,7 @@ get_copy_inheritance(svn_fs_x__copy_id_inherit_t *inherit_p, or if it is a branch point that we are accessing via its original copy destination path. */ svn_fs_x__dag_get_copyroot(©root_rev, ©root_path, child->node); - SVN_ERR(svn_fs_x__revision_root(©root_root, fs, copyroot_rev, + SVN_ERR(svn_fs_x__revision_root(©root_root, fs, copyroot_rev, scratch_pool)); SVN_ERR(svn_fs_x__get_temp_dag_node(©root_node, copyroot_root, copyroot_path, scratch_pool)); @@ -833,7 +833,7 @@ get_copy_inheritance(svn_fs_x__copy_id_inherit_t *inherit_p, } /* Allocate a new svn_fs_x__dag_path_t node from RESULT_POOL, containing - NODE, ENTRY and PARENT, all copied into RESULT_POOL as well. */ + NODE, ENTRY and PARENT; NODE and ENTRY are copied into RESULT_POOL. */ static svn_fs_x__dag_path_t * make_parent_path(dag_node_t *node, const svn_stringbuf_t *entry, @@ -909,7 +909,7 @@ svn_fs_x__get_dag_path(svn_fs_x__dag_path_t **dag_path_p, { /* If this was the last path component, and the caller said it was optional, then don't return an error; - just put a NULL node pointer in the path. + just put a NULL node pointer in the path. */ if ((flags & svn_fs_x__dag_path_last_optional) && (path_len == path.len)) |