svn commit: r1149264 - /subversion/trunk/subversion/libsvn_client/repos_diff.c

[ju...@apache.org]

Author: julianfoad
Date: Thu Jul 21 16:24:12 2011
New Revision: 1149264

URL: http://svn.apache.org/viewvc?rev=1149264&view=rev
Log:
Start using a scratch pool parameter that was introduced in r1097039.

* subversion/libsvn_client/repos_diff.c
  (get_file_from_ra): Use the 'scratch_pool' parameter where possible.
  (apply_textdelta): Pass the local 'scratch_pool' to it. This change
    currently has no effect because the 'scratch_pool' variable used here is
    simply a copy of the 'b->pool' that was previously used here. But the
    other two callers of get_file_from_ra() are passing real scratch pools.

Modified:
    subversion/trunk/subversion/libsvn_client/repos_diff.c

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1149264&r1=1149263&r2=1149264&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Thu Jul 21 16:24:12 2011
@@ -334,11 +334,11 @@ get_file_from_ra(struct file_baton *b,
       svn_stream_t *fstream;
 
       SVN_ERR(svn_stream_open_unique(&fstream, &(b->path_start_revision), NULL,
-                                     svn_io_file_del_on_pool_cleanup, b->pool,
-                                     b->pool));
+                                     svn_io_file_del_on_pool_cleanup,
+                                     scratch_pool, scratch_pool));
 
       fstream = svn_stream_checksummed2(fstream, NULL, &b->start_md5_checksum,
-                                        svn_checksum_md5, TRUE, b->pool);
+                                        svn_checksum_md5, TRUE, scratch_pool);
 
       /* Retrieve the file and its properties */
       SVN_ERR(svn_ra_get_file(b->edit_baton->ra_session,
@@ -898,7 +898,7 @@ apply_textdelta(void *file_baton,
 
   /* We need the expected pristine file, so go get it */
   if (!b->added)
-    SVN_ERR(get_file_from_ra(b, FALSE, b->pool));
+    SVN_ERR(get_file_from_ra(b, FALSE, scratch_pool));
   else
     SVN_ERR(get_empty_file(b->edit_baton, &(b->path_start_revision)));