subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1693407 - /subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
Date Thu, 30 Jul 2015 10:42:18 GMT
Author: julianfoad
Date: Thu Jul 30 10:42:18 2015
New Revision: 1693407

URL: http://svn.apache.org/r1693407
Log:
On the 'move-tracking-2' branch: A follow-up to r1693405.

* subversion/libsvn_delta/editor3e.c
  (VALID_PAYLOAD): Use 'svn_element_payload_invariants' instead of long-hand
    code.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c?rev=1693407&r1=1693406&r2=1693407&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c Thu Jul 30 10:42:18
2015
@@ -174,12 +174,7 @@ check_cancel(svn_editor3_t *editor)
 #define VALID_NODE_KIND(kind) ((kind) != svn_node_unknown && (kind) != svn_node_none)
 #define VALID_EID(eid) ((eid) >= 0)
 #define VALID_NAME(name) ((name) && (name)[0] && svn_relpath_is_canonical(name))
-#define VALID_PAYLOAD(payload) \
-          ((payload) \
-           && (((payload)->kind == svn_node_unknown) \
-                ? ((payload)->ref.relpath && SVN_IS_VALID_REVNUM((payload)->ref.rev))
\
-                : (VALID_NODE_KIND((payload)->kind) \
-                   && ((payload)->props != NULL))))
+#define VALID_PAYLOAD(payload) svn_element_payload_invariants(payload)
 #define VALID_EL_REV_ID(el_rev) (el_rev && el_rev->branch && VALID_EID(el_rev->eid))
 
 #define VERIFY(method, expr) \



Mime
View raw message