svn commit: r1682278 - /subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c

[ju...@apache.org]

Author: julianfoad
Date: Thu May 28 16:58:39 2015
New Revision: 1682278

URL: http://svn.apache.org/r1682278
Log:
On the 'move-tracking-2' branch: Add some assertions.

* subversion/libsvn_delta/branch.c
  (assert_branch_state_invariants): Assert validity of elements in the map.

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

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1682278&r1=1682277&r2=1682278&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Thu May 28 16:58:39 2015
@@ -118,12 +118,19 @@ svn_branch_revision_root_get_branch_by_i
   return branch;
 }
 
+static void
+branch_validate_element(const svn_branch_state_t *branch,
+                        int eid,
+                        const svn_branch_el_rev_content_t *element);
+
 /* Assert BRANCH satisfies all its invariants.
  */
 static void
 assert_branch_state_invariants(const svn_branch_state_t *branch,
                                apr_pool_t *scratch_pool)
 {
+  apr_hash_index_t *hi;
+
   assert(branch->rev_root);
   if (branch->outer_branch)
     {
@@ -135,6 +142,14 @@ assert_branch_state_invariants(const svn
       assert(branch->outer_eid == -1);
     }
   assert(branch->e_map);
+
+  /* Validate elements in the map */
+  for (hi = apr_hash_first(scratch_pool, branch->e_map);
+       hi; hi = apr_hash_next(hi))
+    {
+      branch_validate_element(branch, svn_int_hash_this_key(hi),
+                              apr_hash_this_val(hi));
+    }
 }
 
 svn_branch_state_t *