Hi,

We can use SCRATCH_POOL in the calls to svn_uri_condense_targets/svn_dirent_condense_targets wherever it is applicable. It will save few bits of memory.

The attached patch forces SCRATCH_POOL usage in few places.

Thanks & Regards,
Vijayaguru
[[[
Pass SCRATCH_POOL to svn_dirent_condense_targets/svn_uri_condense_targets
wherever it is applicable.

* subversion/libsvn_client/delete.c:
  (delete_urls): Pass subpool in the call to svn_uri_condense_targets.
* subversion/libsvn_client/locking_commands.c:
  (organize_lock_targets): Pass subpool in the call to
    svn_uri_condense_targets and svn_dirent_condense_targets.

Patch by: Vijayaguru G <vijay{_AT_}collab.net>
Suggested by: Kameshj
]]]
Index: subversion/libsvn_client/delete.c
===================================================================
--- subversion/libsvn_client/delete.c	(revision 1053004)
+++ subversion/libsvn_client/delete.c	(working copy)
@@ -158,7 +158,7 @@
 
   /* Condense our list of deletion targets. */
   SVN_ERR(svn_uri_condense_targets(&common, &targets, paths, TRUE,
-                                   pool, pool));
+                                   pool, subpool));
   if (! targets->nelts)
     {
       const char *bname;
Index: subversion/libsvn_client/locking_commands.c
===================================================================
--- subversion/libsvn_client/locking_commands.c	(revision 1053004)
+++ subversion/libsvn_client/locking_commands.c	(working copy)
@@ -193,12 +193,12 @@
   if (url_mode)
     {
       SVN_ERR(svn_uri_condense_targets(common_parent_url, &rel_targets,
-                                       targets, TRUE, pool, pool));
+                                       targets, TRUE, pool, subpool));
     }
   else
     {
       SVN_ERR(svn_dirent_condense_targets(common_parent_url, &rel_targets,
-                                          targets, TRUE, pool, pool));
+                                          targets, TRUE, pool, subpool));
     }
 
   /* svn_path_condense_targets leaves paths empty if TARGETS only had
@@ -271,7 +271,7 @@
 
       /* Condense our absolute urls and get the relative urls. */
       SVN_ERR(svn_uri_condense_targets(&common_url, &rel_urls, urls,
-                                       FALSE, pool, pool));
+                                       FALSE, pool, subpool));
 
       /* svn_path_condense_targets leaves paths empty if TARGETS only had
          1 member, so we special case that (again). */

Reply via email to