diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2015-10-12 08:54:49 +0000 |
| commit | dc5d469d6574e9fb03bdd793658bb371315b306a (patch) | |
| tree | 013c2e6845398e5a9ca4901dcc077769c7520e1d /subversion/libsvn_wc/old-and-busted.c | |
| parent | 58218291fa73a17020ef0447398e9e8a78f9e8c7 (diff) | |
Diffstat (limited to 'subversion/libsvn_wc/old-and-busted.c')
| -rw-r--r-- | subversion/libsvn_wc/old-and-busted.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subversion/libsvn_wc/old-and-busted.c b/subversion/libsvn_wc/old-and-busted.c index b87be85550bb..8cd94af2733b 100644 --- a/subversion/libsvn_wc/old-and-busted.c +++ b/subversion/libsvn_wc/old-and-busted.c @@ -443,7 +443,7 @@ svn_wc__serialize_file_external(const char **str, SVN_ERR(opt_revision_to_string(&s1, path, peg_rev, pool)); SVN_ERR(opt_revision_to_string(&s2, path, rev, pool)); - s = apr_pstrcat(pool, s1, ":", s2, ":", path, (char *)NULL); + s = apr_pstrcat(pool, s1, ":", s2, ":", path, SVN_VA_NULL); } else s = NULL; @@ -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 |