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

[ju...@apache.org]

Author: julianfoad
Date: Wed Oct 21 09:18:38 2015
New Revision: 1709777

URL: http://svn.apache.org/viewvc?rev=1709777&view=rev
Log:
On the 'move-tracking-2' branch: Allow an output pointer to be null.

* subversion/libsvn_delta/branch.c
  (branch_txn_open_branch,
   branch_txn_branch): Allow the output pointer to be null.

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=1709777&r1=1709776&r2=1709777&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed Oct 21 09:18:38 2015
@@ -138,13 +138,14 @@ branch_txn_open_branch(svn_branch_txn_t
                        apr_pool_t *result_pool,
                        apr_pool_t *scratch_pool)
 {
+  const char *new_branch_id;
   svn_branch_state_t *new_branch;
 
   /* if the subbranch already exists, just return its bid */
-  *new_branch_id_p
+  new_branch_id
     = svn_branch_id_nest(outer_branch_id, outer_eid, result_pool);
   new_branch
-    = svn_branch_txn_get_branch_by_id(txn, *new_branch_id_p, scratch_pool);
+    = svn_branch_txn_get_branch_by_id(txn, new_branch_id, scratch_pool);
   if (new_branch)
     {
       SVN_ERR_ASSERT(root_eid == svn_branch_root_eid(new_branch));
@@ -152,9 +153,12 @@ branch_txn_open_branch(svn_branch_txn_t
     }
 
   new_branch = svn_branch_txn_add_new_branch(txn,
-                                             *new_branch_id_p,
+                                             new_branch_id,
                                              predecessor,
                                              root_eid, scratch_pool);
+
+  if (new_branch_id_p)
+    *new_branch_id_p = new_branch_id;
   return SVN_NO_ERROR;
 }
 
@@ -172,6 +176,7 @@ branch_txn_branch(svn_branch_txn_t *txn,
   svn_branch_state_t *new_branch;
   svn_branch_state_t *from_branch;
   svn_element_tree_t *from_subtree;
+  const char *new_branch_id;
 
   SVN_ERR(branch_in_rev_or_txn(&from_branch, from, txn, scratch_pool));
   /* Source branch must exist */
@@ -194,17 +199,20 @@ branch_txn_branch(svn_branch_txn_t *txn,
                                from->rev, from->bid, from->eid);
     }
 
-  *new_branch_id_p
+  new_branch_id
     = svn_branch_id_nest(outer_branch_id, outer_eid, result_pool);
   predecessor = svn_branch_rev_bid_create(from->rev, from->bid, scratch_pool);
   new_branch = svn_branch_txn_add_new_branch(txn,
-                                             *new_branch_id_p,
+                                             new_branch_id,
                                              predecessor,
                                              from->eid, scratch_pool);
 
   /* Populate the mapping from the 'from' source */
   SVN_ERR(svn_branch_instantiate_elements(new_branch, from_subtree,
                                           scratch_pool));
+
+  if (new_branch_id_p)
+    *new_branch_id_p = new_branch_id;
   return SVN_NO_ERROR;
 }