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 2017/07/22 15:25:45 UTC

svn commit: r1802701 - /subversion/branches/addremove/subversion/libsvn_client/addremove.c

Author: stsp
Date: Sat Jul 22 15:25:45 2017
New Revision: 1802701

URL: http://svn.apache.org/viewvc?rev=1802701&view=rev
Log:
On the addremove branch, make small cosmetic fixes. No functional change.

* subversion/libsvn_client/addremove.c
  (addremove_status_func): Fix indentation.
  (addremove): Use an iterpool during the second loop as well.

Modified:
    subversion/branches/addremove/subversion/libsvn_client/addremove.c

Modified: subversion/branches/addremove/subversion/libsvn_client/addremove.c
URL: http://svn.apache.org/viewvc/subversion/branches/addremove/subversion/libsvn_client/addremove.c?rev=1802701&r1=1802700&r2=1802701&view=diff
==============================================================================
--- subversion/branches/addremove/subversion/libsvn_client/addremove.c (original)
+++ subversion/branches/addremove/subversion/libsvn_client/addremove.c Sat Jul 22 15:25:45 2017
@@ -84,8 +84,8 @@ addremove_status_func(void *baton, const
           break;
         }
 
-        default:
-          break;
+      default:
+        break;
     }
 
   return SVN_NO_ERROR;
@@ -158,21 +158,24 @@ addremove(const char *local_abspath, svn
                     ctx, iterpool, iterpool));
         }
     }
-  svn_pool_destroy(iterpool);
 
   for (hi = apr_hash_first(scratch_pool, b.missing); hi;
        hi = apr_hash_next(hi))
     {
       const char *missing_abspath = apr_hash_this_key(hi);
 
+      svn_pool_clear(iterpool);
+
       SVN_ERR(svn_wc_delete4(ctx->wc_ctx, missing_abspath,
                              FALSE, /* keep_local */
                              FALSE, /* delete_unversioned_target */
                              ctx->cancel_func, ctx->cancel_baton,
                              ctx->notify_func2, ctx->notify_baton2,
-                             scratch_pool));
+                             iterpool));
     }
 
+  svn_pool_destroy(iterpool);
+
   return SVN_NO_ERROR;
 }