You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/10/21 13:19:33 UTC
svn commit: r1709798 - in /subversion/trunk/subversion/mod_dav_svn: merge.c
repos.c
Author: stefan2
Date: Wed Oct 21 11:19:32 2015
New Revision: 1709798
URL: http://svn.apache.org/viewvc?rev=1709798&view=rev
Log:
Switch the last FS revprop API users to the rev'ed functions.
This fixes the last deprecation warnings
* subversion/mod_dav_svn/merge.c
(dav_svn__merge_response): Call the latest API variant, always
requesting the latest data.
* subversion/mod_dav_svn/repos.c
(get_last_modified): Same.
Modified:
subversion/trunk/subversion/mod_dav_svn/merge.c
subversion/trunk/subversion/mod_dav_svn/repos.c
Modified: subversion/trunk/subversion/mod_dav_svn/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/merge.c?rev=1709798&r1=1709797&r2=1709798&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/merge.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/merge.c Wed Oct 21 11:19:32 2015
@@ -268,16 +268,16 @@ dav_svn__merge_response(ap_filter_t *out
/* get the creationdate and creator-displayname of the new revision, too. */
- serr = svn_fs_revision_prop(&creationdate, repos->fs, new_rev,
- SVN_PROP_REVISION_DATE, pool);
+ serr = svn_fs_revision_prop2(&creationdate, repos->fs, new_rev,
+ SVN_PROP_REVISION_DATE, TRUE, pool, pool);
if (serr != NULL)
{
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
"Could not get date of newest revision",
repos->pool);
}
- serr = svn_fs_revision_prop(&creator_displayname, repos->fs, new_rev,
- SVN_PROP_REVISION_AUTHOR, pool);
+ serr = svn_fs_revision_prop2(&creator_displayname, repos->fs, new_rev,
+ SVN_PROP_REVISION_AUTHOR, TRUE, pool, pool);
if (serr != NULL)
{
return dav_svn__convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
Modified: subversion/trunk/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/repos.c?rev=1709798&r1=1709797&r2=1709798&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/repos.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/repos.c Wed Oct 21 11:19:32 2015
@@ -3035,8 +3035,9 @@ get_last_modified(const dav_resource *re
return -1;
}
- if ((serr = svn_fs_revision_prop(&date_time, resource->info->repos->fs,
- created_rev, "svn:date", resource->pool)))
+ if ((serr = svn_fs_revision_prop2(&date_time, resource->info->repos->fs,
+ created_rev, "svn:date", TRUE,
+ resource->pool, resource->pool)))
{
svn_error_clear(serr);
return -1;