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/11 02:32:13 UTC
svn commit: r1650850 - in /subversion/trunk/subversion/libsvn_fs_x:
noderevs.c noderevs.h
Author: stefan2
Date: Sun Jan 11 01:32:12 2015
New Revision: 1650850
URL: http://svn.apache.org/r1650850
Log:
Continue migrating FSX to the two-pool paradigm. Many single-pool functions
don't allocate a return value, i.e. their pools can immediately be renamed
to SCRATCH_POOL. Do this for noderevs.* .
* subversion/libsvn_fs_x/noderevs.h
(svn_fs_x__write_noderevs_container): POOL is actually a SCRATCH_POOL.
* subversion/libsvn_fs_x/noderevs.c
(svn_fs_x__write_noderevs_container): Same.
Modified:
subversion/trunk/subversion/libsvn_fs_x/noderevs.c
subversion/trunk/subversion/libsvn_fs_x/noderevs.h
Modified: subversion/trunk/subversion/libsvn_fs_x/noderevs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/noderevs.c?rev=1650850&r1=1650849&r2=1650850&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/noderevs.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/noderevs.c Sun Jan 11 01:32:12 2015
@@ -538,16 +538,16 @@ write_reps(svn_packed__int_stream_t *rep
svn_error_t *
svn_fs_x__write_noderevs_container(svn_stream_t *stream,
const svn_fs_x__noderevs_t *container,
- apr_pool_t *pool)
+ apr_pool_t *scratch_pool)
{
int i;
string_table_t *paths = container->paths
? container->paths
: svn_fs_x__string_table_create(container->builder,
- pool);
+ scratch_pool);
- svn_packed__data_root_t *root = svn_packed__data_create_root(pool);
+ svn_packed__data_root_t *root = svn_packed__data_create_root(scratch_pool);
/* one common top-level stream for all arrays. One sub-stream */
svn_packed__int_stream_t *structs_stream
@@ -610,8 +610,8 @@ svn_fs_x__write_noderevs_container(svn_s
}
/* write to disk */
- SVN_ERR(svn_fs_x__write_string_table(stream, paths, pool));
- SVN_ERR(svn_packed__data_write(stream, root, pool));
+ SVN_ERR(svn_fs_x__write_string_table(stream, paths, scratch_pool));
+ SVN_ERR(svn_packed__data_write(stream, root, scratch_pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_fs_x/noderevs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/noderevs.h?rev=1650850&r1=1650849&r2=1650850&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/noderevs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/noderevs.h Sun Jan 11 01:32:12 2015
@@ -79,13 +79,13 @@ svn_fs_x__noderevs_get(svn_fs_x__noderev
/* I/O interface. */
-/* Write a serialized representation of CONTAINER to STREAM. Use POOL for
- * temporary allocations.
+/* Write a serialized representation of CONTAINER to STREAM.
+ * Use SCRATCH_POOL for temporary allocations.
*/
svn_error_t *
svn_fs_x__write_noderevs_container(svn_stream_t *stream,
- const svn_fs_x__noderevs_t *container,
- apr_pool_t *pool);
+ const svn_fs_x__noderevs_t *container,
+ apr_pool_t *scratch_pool);
/* Read a noderev container from its serialized representation in STREAM.
* Allocate the result in RESULT_POOL and return it in *CONTAINER. Use