svn commit: r927456 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

[ju...@apache.org]

Author: julianfoad
Date: Thu Mar 25 15:45:59 2010
New Revision: 927456

URL: http://svn.apache.org/viewvc?rev=927456&view=rev
Log:
Fix a build failure and a pool inefficiency both introduced in r927373.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc_process_committed_queue2): Use svn_hash__clear() instead of
    apr_hash_clear() which is only available in APR >= v1.3.0.  Improve pool
    usage by passing iterpool rather than scratch_pool.

Modified:
    subversion/trunk/subversion/libsvn_wc/adm_ops.c

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=927456&r1=927455&r2=927456&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 25 15:45:59 2010
@@ -719,7 +719,7 @@ svn_wc_process_committed_queue2(svn_wc_c
          been (or will be) accounted for when that recursive item was (or
          will be) processed. */
       if (queue->have_recursive && have_recursive_parent(queue->queue, cqi,
-                                                         scratch_pool))
+                                                         iterpool))
         continue;
 
       SVN_ERR(svn_wc__process_committed_internal(wc_ctx->db, cqi->local_abspath,
@@ -735,7 +735,7 @@ svn_wc_process_committed_queue2(svn_wc_c
                              iterpool));
     }
 
-  apr_hash_clear(queue->queue);
+  svn_hash__clear(queue->queue, scratch_pool);
 
   svn_pool_destroy(iterpool);