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

[cm...@apache.org]

Author: cmpilato
Date: Thu Mar 11 16:32:50 2010
New Revision: 921923

URL: http://svn.apache.org/viewvc?rev=921923&view=rev
Log:
* subversion/libsvn_wc/adm_ops.c
  (mark_item_copied): Rename 'pool' argument to 'scratch_pool' per
    local conventions.

Suggested by: gstein

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=921923&r1=921922&r2=921923&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Mar 11 16:32:50 2010
@@ -1191,7 +1191,7 @@ static svn_error_t *
 mark_item_copied(svn_wc__db_t *db,
                  const char *local_abspath,
                  svn_wc__db_kind_t local_kind,
-                 apr_pool_t *pool)
+                 apr_pool_t *scratch_pool)
 {
   apr_hash_t *props;
   svn_wc_entry_t tmp_entry;
@@ -1201,14 +1201,14 @@ mark_item_copied(svn_wc__db_t *db,
   /* Squirrel away the pristine properties to install them on
      working, because we might delete the base table */
   SVN_ERR(svn_wc__db_read_pristine_props(&props, db, local_abspath,
-                                         pool, pool));
+                                         scratch_pool, scratch_pool));
   tmp_entry.copied = TRUE;
   SVN_ERR(svn_wc__entry_modify2(db, local_abspath, kind, FALSE, &tmp_entry,
-                                SVN_WC__ENTRY_MODIFY_COPIED, pool));
+                                SVN_WC__ENTRY_MODIFY_COPIED, scratch_pool));
 
   /* Reinstall the pristine properties on working */
   SVN_ERR(svn_wc__db_temp_op_set_pristine_props(db, local_abspath, props,
-                                                TRUE, pool));
+                                                TRUE, scratch_pool));
   
   return SVN_NO_ERROR;
 }