Author: stefan2
Date: Tue Jan 6 16:42:19 2015
New Revision: 1649870
URL: http://svn.apache.org/r1649870
Log:
Remove an unused POOL parameter and update code along the call stack.
* subversion/libsvn_fs_x/fs_x.c
(svn_fs_x__file_length): We don't need the POOL.
* subversion/libsvn_fs_x/fs_x.h
(svn_fs_x__file_length): Update declaration in header.
* subversion/libsvn_fs_x/dag.c
(svn_fs_x__dag_file_length): Bubble-up - we don't need the POOL.
* subversion/libsvn_fs_x/dag.h
(svn_fs_x__dag_file_length): Update declaration in header.
* subversion/libsvn_fs_x/tree.c
(x_file_length): Update caller.
Modified:
subversion/trunk/subversion/libsvn_fs_x/dag.c
subversion/trunk/subversion/libsvn_fs_x/dag.h
subversion/trunk/subversion/libsvn_fs_x/fs_x.c
subversion/trunk/subversion/libsvn_fs_x/fs_x.h
subversion/trunk/subversion/libsvn_fs_x/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.c?rev=1649870&r1=1649869&r2=1649870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.c Tue Jan 6 16:42:19 2015
@@ -998,8 +998,7 @@ svn_fs_x__dag_try_process_file_contents(
svn_error_t *
svn_fs_x__dag_file_length(svn_filesize_t *length,
- dag_node_t *file,
- apr_pool_t *pool)
+ dag_node_t *file)
{
svn_fs_x__noderev_t *noderev;
@@ -1012,7 +1011,7 @@ svn_fs_x__dag_file_length(svn_filesize_t
/* Go get a fresh node-revision for FILE, and . */
SVN_ERR(get_node_revision(&noderev, file));
- return svn_fs_x__file_length(length, noderev, pool);
+ return svn_fs_x__file_length(length, noderev);
}
Modified: subversion/trunk/subversion/libsvn_fs_x/dag.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/dag.h?rev=1649870&r1=1649869&r2=1649870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/dag.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/dag.h Tue Jan 6 16:42:19 2015
@@ -492,13 +492,10 @@ svn_fs_x__dag_finalize_edits(dag_node_t
/* Set *LENGTH to the length of the contents of FILE.
-
- Use POOL for all allocations.
*/
svn_error_t *
svn_fs_x__dag_file_length(svn_filesize_t *length,
- dag_node_t *file,
- apr_pool_t *pool);
+ dag_node_t *file);
/* Put the recorded checksum of type KIND for FILE into CHECKSUM, allocating
from RESULT_POOL.
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.c?rev=1649870&r1=1649869&r2=1649870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.c Tue Jan 6 16:42:19 2015
@@ -681,8 +681,7 @@ svn_fs_x__revision_proplist(apr_hash_t *
svn_error_t *
svn_fs_x__file_length(svn_filesize_t *length,
- svn_fs_x__noderev_t *noderev,
- apr_pool_t *pool)
+ svn_fs_x__noderev_t *noderev)
{
if (noderev->data_rep)
*length = noderev->data_rep->expanded_size;
Modified: subversion/trunk/subversion/libsvn_fs_x/fs_x.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs_x.h?rev=1649870&r1=1649869&r2=1649870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs_x.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs_x.h Tue Jan 6 16:42:19 2015
@@ -84,11 +84,10 @@ svn_fs_x__revision_proplist(apr_hash_t *
apr_pool_t *pool);
/* Set *LENGTH to the be fulltext length of the node revision
- specified by NODEREV. Use POOL for temporary allocations. */
+ specified by NODEREV. */
svn_error_t *
svn_fs_x__file_length(svn_filesize_t *length,
- svn_fs_x__noderev_t *noderev,
- apr_pool_t *pool);
+ svn_fs_x__noderev_t *noderev);
/* Return TRUE if the representations in A and B have equal contents, else
return FALSE. */
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1649870&r1=1649869&r2=1649870&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Tue Jan 6 16:42:19 2015
@@ -2790,7 +2790,7 @@ x_file_length(svn_filesize_t *length_p,
SVN_ERR(get_dag(&file, root, path, pool));
/* Now fetch its length */
- return svn_fs_x__dag_file_length(length_p, file, pool);
+ return svn_fs_x__dag_file_length(length_p, file);
}
