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/13 02:40:38 UTC
svn commit: r1651262 - in /subversion/trunk/subversion/libsvn_fs_x: index.c
index.h
Author: stefan2
Date: Tue Jan 13 01:40:37 2015
New Revision: 1651262
URL: http://svn.apache.org/r1651262
Log:
* subversion/libsvn_fs_x/index.c
(svn_fs_x__p2l_entry_dup): The POOL is a pure RESULT_POOL.
Simplify copy code.
* subversion/libsvn_fs_x/index.h
(svn_fs_x__p2l_entry_dup): Make the header reflect the source changes.
Modified:
subversion/trunk/subversion/libsvn_fs_x/index.c
subversion/trunk/subversion/libsvn_fs_x/index.h
Modified: subversion/trunk/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.c?rev=1651262&r1=1651261&r2=1651262&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.c Tue Jan 13 01:40:37 2015
@@ -2001,13 +2001,12 @@ svn_fs_x__l2p_get_max_ids(apr_array_head
*/
svn_fs_x__p2l_entry_t *
svn_fs_x__p2l_entry_dup(const svn_fs_x__p2l_entry_t *entry,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
- svn_fs_x__p2l_entry_t *new_entry = apr_palloc(pool, sizeof(*new_entry));
- *new_entry = *entry;
-
+ svn_fs_x__p2l_entry_t *new_entry = apr_pmemdup(result_pool, entry,
+ sizeof(*new_entry));
if (new_entry->item_count)
- new_entry->items = apr_pmemdup(pool,
+ new_entry->items = apr_pmemdup(result_pool,
entry->items,
entry->item_count * sizeof(*entry->items));
Modified: subversion/trunk/subversion/libsvn_fs_x/index.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/index.h?rev=1651262&r1=1651261&r2=1651262&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/index.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/index.h Tue Jan 13 01:40:37 2015
@@ -80,11 +80,11 @@ typedef struct svn_fs_x__p2l_entry_t
svn_fs_x__id_t *items;
} svn_fs_x__p2l_entry_t;
-/* Return a (deep) copy of ENTRY, allocated in POOL.
+/* Return a (deep) copy of ENTRY, allocated in RESULT_POOL.
*/
svn_fs_x__p2l_entry_t *
svn_fs_x__p2l_entry_dup(const svn_fs_x__p2l_entry_t *entry,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
/* Open / create a log-to-phys index file with the full file path name
* FILE_NAME. Return the open file in *PROTO_INDEX allocated in