Author: stefan2
Date: Sat Jan 17 22:15:20 2015
New Revision: 1652686
URL: http://svn.apache.org/r1652686
Log:
svn_fs_x__get_contents only needs a single pool. Propagate up the call stack.
* subversion/libsvn_fs_x/cached_data.h
(svn_fs_x__get_contents): Sync declaration with its definition.
* subversion/libsvn_fs_x/dag.c
(svn_fs_x__dag_get_contents): The POOL is actually a pure RESULT_POOL.
* subversion/libsvn_fs_x/dag.h
(svn_fs_x__dag_get_contents): Sync declaration with its definition.
Modified:
subversion/trunk/subversion/libsvn_fs_x/cached_data.h
subversion/trunk/subversion/libsvn_fs_x/dag.c
subversion/trunk/subversion/libsvn_fs_x/dag.h
Modified: subversion/trunk/subversion/libsvn_fs_x/cached_data.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/cached_data.h?rev=1652686&r1=1652685&r2=1652686&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/cached_data.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/cached_data.h Sat Jan 17 22:15:20
2015
@@ -71,13 +71,13 @@ svn_fs_x__rep_chain_length(int *chain_le
representation REP as seen in filesystem FS. If CACHE_FULLTEXT is
not set, bypass fulltext cache lookup for this rep and don't put the
reconstructed fulltext into cache.
- Use POOL for allocations. */
+ Allocate *CONTENT_P in RESULT_POOL. */
svn_error_t *
svn_fs_x__get_contents(svn_stream_t **contents_p,
svn_fs_t *fs,
svn_fs_x__representation_t *rep,
svn_boolean_t cache_fulltext,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
/* Determine on-disk and expanded sizes of the representation identified
* by ENTRY in FS and return the result in PACKED_LEN and EXPANDED_LEN,
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1652686&r1=1652685&r2=1652686&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.c Sat Jan 17 22:15:20 2015
@@ -942,7 +942,7 @@ svn_fs_x__dag_make_dir(dag_node_t **chil
svn_error_t *
svn_fs_x__dag_get_contents(svn_stream_t **contents_p,
dag_node_t *file,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
svn_fs_x__noderev_t *noderev;
svn_stream_t *contents;
@@ -958,7 +958,7 @@ svn_fs_x__dag_get_contents(svn_stream_t
/* Get a stream to the contents. */
SVN_ERR(svn_fs_x__get_contents(&contents, file->fs,
- noderev->data_rep, TRUE, pool));
+ noderev->data_rep, TRUE, result_pool));
*contents_p = contents;
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.h?rev=1652686&r1=1652685&r2=1652686&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.h Sat Jan 17 22:15:20 2015
@@ -415,16 +415,14 @@ svn_fs_x__dag_make_dir(dag_node_t **chil
/* Set *CONTENTS to a readable generic stream which yields the
- contents of FILE. Allocate the stream in POOL.
+ contents of FILE. Allocate the stream in RESULT_POOL.
If FILE is not a file, return SVN_ERR_FS_NOT_FILE.
-
- Use POOL for all allocations.
*/
svn_error_t *
svn_fs_x__dag_get_contents(svn_stream_t **contents,
dag_node_t *file,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
/* Attempt to fetch the contents of NODE and pass it along with the BATON
to the PROCESSOR. Set *SUCCESS only of the data could be provided
