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

[ju...@apache.org]

Author: julianfoad
Date: Fri Aug 19 16:06:52 2011
New Revision: 1159672

URL: http://svn.apache.org/viewvc?rev=1159672&view=rev
Log:
* subversion/libsvn_client/repos_diff.c
  (get_file_from_ra): Revert a part of r1149264 where I inadvertently
    used 'scratch_pool' for allocating the file path result and for
    registering the file cleanup handler. In current callers this didn't
    matter because the two pools were either the same or had the same
    lifetime.

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=1159672&r1=1159671&r2=1159672&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Fri Aug 19 16:06:52 2011
@@ -319,7 +319,7 @@ get_file_mime_types(const char **mimetyp
  * Set B->path_start_revision to the path of a new temporary file containing
  * the file's text.  Set B->pristine_props to a new hash containing the
  * file's properties.  Install a pool cleanup handler on B->pool to delete
- * the file.
+ * the file.  Allocate all results in B->pool.
  */
 static svn_error_t *
 get_file_from_ra(struct file_baton *b,
@@ -332,7 +332,7 @@ get_file_from_ra(struct file_baton *b,
 
       SVN_ERR(svn_stream_open_unique(&fstream, &(b->path_start_revision), NULL,
                                      svn_io_file_del_on_pool_cleanup,
-                                     scratch_pool, scratch_pool));
+                                     b->pool, scratch_pool));
 
       fstream = svn_stream_checksummed2(fstream, NULL, &b->start_md5_checksum,
                                         svn_checksum_md5, TRUE, scratch_pool);