You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/03/10 14:34:04 UTC

svn commit: r921342 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_wc/adm_ops.c libsvn_wc/deprecated.c

Author: philip
Date: Wed Mar 10 13:34:04 2010
New Revision: 921342

URL: http://svn.apache.org/viewvc?rev=921342&view=rev
Log:
Suggested by: gstein

* subversion/include/svn_wc.h
  (svn_wc_process_committed_queue2): Rename pool parameter to scratch_pool.

* subversion/libsvn_wc/adm_ops.c
  (svn_wc_process_committed_queue2): Rename pool parameter.

* subversion/libsvn_wc/deprecated.c
  (svn_wc_process_committed_queue): Destroy context.

Modified:
    subversion/trunk/subversion/include/svn_wc.h
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/deprecated.c

Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=921342&r1=921341&r2=921342&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Wed Mar 10 13:34:04 2010
@@ -4832,7 +4832,7 @@ svn_wc_process_committed_queue2(svn_wc_c
 				svn_revnum_t new_revnum,
 				const char *rev_date,
 				const char *rev_author,
-				apr_pool_t *pool);
+				apr_pool_t *scratch_pool);
 
 /** @see svn_wc_process_committed_queue2()
  *

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=921342&r1=921341&r2=921342&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Wed Mar 10 13:34:04 2010
@@ -708,14 +708,14 @@ svn_wc_process_committed_queue2(svn_wc_c
                                 svn_revnum_t new_revnum,
                                 const char *rev_date,
                                 const char *rev_author,
-                                apr_pool_t *pool)
+                                apr_pool_t *scratch_pool)
 {
   int i;
-  apr_pool_t *iterpool = svn_pool_create(pool);
+  apr_pool_t *iterpool = svn_pool_create(scratch_pool);
   apr_time_t new_date;
 
   if (rev_date)
-    SVN_ERR(svn_time_from_cstring(&new_date, rev_date, pool));
+    SVN_ERR(svn_time_from_cstring(&new_date, rev_date, scratch_pool));
   else
     new_date = 0;
 

Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=921342&r1=921341&r2=921342&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Wed Mar 10 13:34:04 2010
@@ -3689,6 +3689,8 @@ svn_wc_process_committed_queue(svn_wc_co
                                          pool));
   SVN_ERR(svn_wc_process_committed_queue2(queue, wc_ctx, new_revnum,
                                           rev_date, rev_author, pool));
+  SVN_ERR(svn_wc_context_destroy(wc_ctx));
+
   return SVN_NO_ERROR;
 }