You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2015/01/17 23:37:51 UTC
svn commit: r1652687 - in /subversion/trunk/subversion/libsvn_fs_x: dag.c
dag.h
Author: stefan2
Date: Sat Jan 17 22:37:51 2015
New Revision: 1652687
URL: http://svn.apache.org/r1652687
Log:
In svn_fs_x__dag_try_process_file_contents, bubble up pool naming from called
functions.
* subversion/libsvn_fs_x/dag.c
(svn_fs_x__dag_try_process_file_contents): POOL is actually a SCRATCH_POOL.
* subversion/libsvn_fs_x/dag.h
(svn_fs_x__dag_try_process_file_contents): Sync declaration with definition.
Modified:
subversion/trunk/subversion/libsvn_fs_x/dag.c
subversion/trunk/subversion/libsvn_fs_x/dag.h
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1652687&r1=1652686&r2=1652687&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.c Sat Jan 17 22:37:51 2015
@@ -1000,7 +1000,7 @@ svn_fs_x__dag_try_process_file_contents(
dag_node_t *node,
svn_fs_process_contents_func_t processor,
void* baton,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
svn_fs_x__noderev_t *noderev;
@@ -1009,7 +1009,7 @@ svn_fs_x__dag_try_process_file_contents(
return svn_fs_x__try_process_file_contents(success, node->fs,
noderev,
- processor, baton, pool);
+ processor, baton, scratch_pool);
}
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.h?rev=1652687&r1=1652686&r2=1652687&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.h Sat Jan 17 22:37:51 2015
@@ -428,14 +428,14 @@ svn_fs_x__dag_get_contents(svn_stream_t
to the PROCESSOR. Set *SUCCESS only of the data could be provided
and the processor had been called.
- Use POOL for all allocations.
+ Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
svn_fs_x__dag_try_process_file_contents(svn_boolean_t *success,
dag_node_t *node,
svn_fs_process_contents_func_t processor,
void* baton,
- apr_pool_t *pool);
+ apr_pool_t *scratch_pool);
/* Set *STREAM_P to a delta stream that will turn the contents of SOURCE into