summaryrefslogtreecommitdiffstats
path: root/subversion/libsvn_client/iprops.c
diff options
context:
space:
mode:
authorpeter <peter@FreeBSD.org>2015-10-12 08:54:49 +0000
committerpeter <peter@FreeBSD.org>2015-10-12 08:54:49 +0000
commitc18b5d7f26f112be58bb1c4660799dea49f219ba (patch)
tree013c2e6845398e5a9ca4901dcc077769c7520e1d /subversion/libsvn_client/iprops.c
parent91308aec6ca93cab82659cd43b3f6a83d366350b (diff)
downloadFreeBSD-src-c18b5d7f26f112be58bb1c4660799dea49f219ba.zip
FreeBSD-src-c18b5d7f26f112be58bb1c4660799dea49f219ba.tar.gz
Vendor import of subversion-1.9.2
Diffstat (limited to 'subversion/libsvn_client/iprops.c')
-rw-r--r--subversion/libsvn_client/iprops.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/subversion/libsvn_client/iprops.c b/subversion/libsvn_client/iprops.c
index 653ce8c..9d725bf 100644
--- a/subversion/libsvn_client/iprops.c
+++ b/subversion/libsvn_client/iprops.c
@@ -176,8 +176,8 @@ get_inheritable_props(apr_hash_t **wcroot_iprops,
hi;
hi = apr_hash_next(hi))
{
- const char *child_abspath = svn__apr_hash_index_key(hi);
- const char *child_repos_relpath = svn__apr_hash_index_val(hi);
+ const char *child_abspath = apr_hash_this_key(hi);
+ const char *child_repos_relpath = apr_hash_this_val(hi);
const char *url;
apr_array_header_t *inherited_props;
svn_error_t *err;
@@ -244,6 +244,8 @@ svn_client__get_inheritable_props(apr_hash_t **wcroot_iprops,
const char *old_session_url;
svn_error_t *err;
+ *wcroot_iprops = NULL;
+
if (!SVN_IS_VALID_REVNUM(revision))
return SVN_NO_ERROR;
OpenPOWER on IntegriCloud