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 2016/02/24 13:14:41 UTC
svn commit: r1732112 - /subversion/trunk/subversion/libsvn_client/conflicts.c
Author: stsp
Date: Wed Feb 24 12:14:41 2016
New Revision: 1732112
URL: http://svn.apache.org/viewvc?rev=1732112&view=rev
Log:
Fix test fallout from r1732079.
* subversion/libsvn_client/conflicts.c
(svn_client_conflict_tree_get_victim_node_kind,
svn_client_conflict_prop_get_reject_abspath,
svn_client_conflict_text_get_mime_type): Pass the proper expression
to SVN_ERR_ASSERT_NO_RETURN().
Modified:
subversion/trunk/subversion/libsvn_client/conflicts.c
Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1732112&r1=1732111&r2=1732112&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb 24 12:14:41 2016
@@ -1797,7 +1797,8 @@ svn_client_conflict_get_incoming_new_rep
svn_node_kind_t
svn_client_conflict_tree_get_victim_node_kind(svn_client_conflict_t *conflict)
{
- SVN_ERR_ASSERT_NO_RETURN(assert_tree_conflict(conflict, conflict->pool));
+ SVN_ERR_ASSERT_NO_RETURN(assert_tree_conflict(conflict, conflict->pool)
+ == SVN_NO_ERROR);
return get_conflict_desc2_t(conflict)->node_kind;
}
@@ -1842,7 +1843,8 @@ svn_client_conflict_prop_get_propvals(co
const char *
svn_client_conflict_prop_get_reject_abspath(svn_client_conflict_t *conflict)
{
- SVN_ERR_ASSERT_NO_RETURN(assert_prop_conflict(conflict, conflict->pool));
+ SVN_ERR_ASSERT_NO_RETURN(assert_prop_conflict(conflict, conflict->pool)
+ == SVN_NO_ERROR);
/* svn_wc_conflict_description2_t stores this path in 'their_abspath' */
return get_conflict_desc2_t(conflict)->their_abspath;
@@ -1851,7 +1853,8 @@ svn_client_conflict_prop_get_reject_absp
const char *
svn_client_conflict_text_get_mime_type(svn_client_conflict_t *conflict)
{
- SVN_ERR_ASSERT_NO_RETURN(assert_text_conflict(conflict, conflict->pool));
+ SVN_ERR_ASSERT_NO_RETURN(assert_text_conflict(conflict, conflict->pool)
+ == SVN_NO_ERROR);
return get_conflict_desc2_t(conflict)->mime_type;
}