subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1671314 - in /subversion/branches/fsx-1.10/subversion/libsvn_fs_x: changes.c changes.h index.c index.h noderevs.c noderevs.h reps.c reps.h temp_serializer.c temp_serializer.h
Date Sat, 04 Apr 2015 20:33:13 GMT
Author: stefan2
Date: Sat Apr  4 20:33:13 2015
New Revision: 1671314

URL: http://svn.apache.org/r1671314
Log:
On the fsx-1.10 branch:
Batch pool renaming for cache de-serializer functions in FSX.
Their pool parameters are pure RESULT_POOLs, see declaration
of svn_cache__deserialize_func_t.

* subversion/libsvn_fs_x/changes.c
  (svn_fs_x__deserialize_changes_container): Sync. pool name with
                                             function type declaration.

* subversion/libsvn_fs_x/changes.h
  (svn_fs_x__deserialize_changes_container): Same.

* subversion/libsvn_fs_x/index.c
  (svn_fs_x__deserialize_l2p_header,
   svn_fs_x__deserialize_l2p_page,
   svn_fs_x__deserialize_p2l_header,
   svn_fs_x__deserialize_p2l_page): Same.

* subversion/libsvn_fs_x/index.h
  (svn_fs_x__deserialize_l2p_header,
   svn_fs_x__deserialize_l2p_page,
   svn_fs_x__deserialize_p2l_header,
   svn_fs_x__deserialize_p2l_page): Same.

* subversion/libsvn_fs_x/noderevs.c
  (svn_fs_x__deserialize_noderevs_container): Same.

* subversion/libsvn_fs_x/noderevs.h
  (svn_fs_x__deserialize_noderevs_container): Same.

* subversion/libsvn_fs_x/reps.c
  (svn_fs_x__deserialize_reps_container): Same.

* subversion/libsvn_fs_x/reps.h
  (svn_fs_x__deserialize_reps_container): Same.

* subversion/libsvn_fs_x/temp_serializer.h
  (svn_fs_x__deserialize_apr_array,
   svn_fs_x__deserialize_txdelta_window,
   svn_fs_x__deserialize_manifest,
   svn_fs_x__deserialize_properties,
   svn_fs_x__deserialize_node_revision,
   svn_fs_x__deserialize_dir_entries,
   svn_fs_x__deserialize_rep_header,
   svn_fs_x__deserialize_changes,
   svn_fs_x__deserialize_mergeinfo): Same.

* subversion/libsvn_fs_x/temp_serializer.c
  (svn_fs_x__deserialize_apr_array): Same.
  (deserialize_dir): POOL is a pure RESULT_POOL in this utility
                     function as well.
  (svn_fs_x__deserialize_txdelta_window,
   svn_fs_x__deserialize_manifest,
   svn_fs_x__deserialize_properties,
   svn_fs_x__deserialize_node_revision,
   svn_fs_x__deserialize_dir_entries,
   svn_fs_x__deserialize_rep_header,
   svn_fs_x__deserialize_changes,
   svn_fs_x__deserialize_mergeinfo): Adjust pool name.

Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.h
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.h
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.h
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.h
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.h

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.c?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.c Sat Apr  4 20:33:13 2015
@@ -437,14 +437,14 @@ svn_error_t *
 svn_fs_x__deserialize_changes_container(void **out,
                                          void *data,
                                          apr_size_t data_len,
-                                         apr_pool_t *pool)
+                                         apr_pool_t *result_pool)
 {
   svn_fs_x__changes_t *changes = (svn_fs_x__changes_t *)data;
 
   /* de-serialize sub-structures */
   svn_fs_x__deserialize_string_table(changes, &changes->paths);
-  svn_fs_x__deserialize_apr_array(changes, &changes->changes, pool);
-  svn_fs_x__deserialize_apr_array(changes, &changes->offsets, pool);
+  svn_fs_x__deserialize_apr_array(changes, &changes->changes, result_pool);
+  svn_fs_x__deserialize_apr_array(changes, &changes->offsets, result_pool);
 
   /* done */
   *out = changes;

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.h?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.h Sat Apr  4 20:33:13 2015
@@ -114,7 +114,7 @@ svn_error_t *
 svn_fs_x__deserialize_changes_container(void **out,
                                         void *data,
                                         apr_size_t data_len,
-                                        apr_pool_t *pool);
+                                        apr_pool_t *result_pool);
 
 /* Implements svn_cache__partial_getter_func_t for svn_fs_x__changes_t,
  * setting *OUT to the change list (apr_array_header_t *) selected by

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.c?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.c Sat Apr  4 20:33:13 2015
@@ -3739,7 +3739,7 @@ svn_error_t *
 svn_fs_x__deserialize_l2p_header(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool)
+                                 apr_pool_t *result_pool)
 {
   l2p_header_t *header = (l2p_header_t *)data;
 
@@ -3793,7 +3793,7 @@ svn_error_t *
 svn_fs_x__deserialize_l2p_page(void **out,
                                void *data,
                                apr_size_t data_len,
-                               apr_pool_t *pool)
+                               apr_pool_t *result_pool)
 {
   l2p_page_t *page = data;
 
@@ -3842,7 +3842,7 @@ svn_error_t *
 svn_fs_x__deserialize_p2l_header(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool)
+                                 apr_pool_t *result_pool)
 {
   p2l_header_t *header = data;
 
@@ -3900,7 +3900,7 @@ svn_error_t *
 svn_fs_x__deserialize_p2l_page(void **out,
                                void *data,
                                apr_size_t data_len,
-                               apr_pool_t *pool)
+                               apr_pool_t *result_pool)
 {
   apr_array_header_t *page = (apr_array_header_t *)data;
   svn_fs_x__p2l_entry_t *entries;
@@ -3915,7 +3915,7 @@ svn_fs_x__deserialize_p2l_page(void **ou
     svn_temp_deserializer__resolve(entries, (void**)&entries[i].items);
 
   /* patch up members */
-  page->pool = pool;
+  page->pool = result_pool;
   page->nalloc = page->nelts;
 
   /* done */

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.h?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/index.h Sat Apr  4 20:33:13 2015
@@ -372,7 +372,7 @@ svn_error_t *
 svn_fs_x__deserialize_l2p_header(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool);
+                                 apr_pool_t *result_pool);
 
 /*
  * Implements svn_cache__serialize_func_t for l2p_page_t objects.
@@ -390,7 +390,7 @@ svn_error_t *
 svn_fs_x__deserialize_l2p_page(void **out,
                                void *data,
                                apr_size_t data_len,
-                               apr_pool_t *pool);
+                               apr_pool_t *result_pool);
 
 /*
  * Implements svn_cache__serialize_func_t for p2l_header_t objects.
@@ -408,7 +408,7 @@ svn_error_t *
 svn_fs_x__deserialize_p2l_header(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool);
+                                 apr_pool_t *result_pool);
 
 /*
  * Implements svn_cache__serialize_func_t for apr_array_header_t objects
@@ -428,6 +428,6 @@ svn_error_t *
 svn_fs_x__deserialize_p2l_page(void **out,
                                void *data,
                                apr_size_t data_len,
-                               apr_pool_t *pool);
+                               apr_pool_t *result_pool);
 
 #endif

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.c?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.c Sat Apr  4 20:33:13 2015
@@ -766,15 +766,15 @@ svn_error_t *
 svn_fs_x__deserialize_noderevs_container(void **out,
                                          void *data,
                                          apr_size_t data_len,
-                                         apr_pool_t *pool)
+                                         apr_pool_t *result_pool)
 {
   svn_fs_x__noderevs_t *noderevs = (svn_fs_x__noderevs_t *)data;
 
   /* de-serialize sub-structures */
   svn_fs_x__deserialize_string_table(noderevs, &noderevs->paths);
-  svn_fs_x__deserialize_apr_array(noderevs, &noderevs->ids, pool);
-  svn_fs_x__deserialize_apr_array(noderevs, &noderevs->reps, pool);
-  svn_fs_x__deserialize_apr_array(noderevs, &noderevs->noderevs, pool);
+  svn_fs_x__deserialize_apr_array(noderevs, &noderevs->ids, result_pool);
+  svn_fs_x__deserialize_apr_array(noderevs, &noderevs->reps, result_pool);
+  svn_fs_x__deserialize_apr_array(noderevs, &noderevs->noderevs, result_pool);
 
   /* done */
   *out = noderevs;

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.h?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/noderevs.h Sat Apr  4 20:33:13 2015
@@ -114,7 +114,7 @@ svn_error_t *
 svn_fs_x__deserialize_noderevs_container(void **out,
                                           void *data,
                                           apr_size_t data_len,
-                                          apr_pool_t *pool);
+                                          apr_pool_t *result_pool);
 
 /* Implements svn_cache__partial_getter_func_t for svn_fs_x__noderevs_t,
  * setting *OUT to the svn_fs_x__noderev_t selected by the apr_uint32_t index

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.c?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.c Sat Apr  4 20:33:13 2015
@@ -900,7 +900,7 @@ svn_error_t *
 svn_fs_x__deserialize_reps_container(void **out,
                                      void *data,
                                      apr_size_t data_len,
-                                     apr_pool_t *pool)
+                                     apr_pool_t *result_pool)
 {
   svn_fs_x__reps_t *reps = (svn_fs_x__reps_t *)data;
 

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.h?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/reps.h Sat Apr  4 20:33:13 2015
@@ -172,7 +172,7 @@ svn_error_t *
 svn_fs_x__deserialize_reps_container(void **out,
                                      void *data,
                                      apr_size_t data_len,
-                                     apr_pool_t *pool);
+                                     apr_pool_t *result_pool);
 
 /* Implements svn_cache__partial_getter_func_t for svn_fs_x__reps_t,
  * setting *OUT to an svn_fs_x__rep_extractor_t object defined by the

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.c?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.c Sat Apr  4 20:33:13
2015
@@ -173,14 +173,14 @@ svn_fs_x__serialize_apr_array(svn_temp_s
 void
 svn_fs_x__deserialize_apr_array(void *buffer,
                                 apr_array_header_t **array,
-                                apr_pool_t *pool)
+                                apr_pool_t *result_pool)
 {
   svn_temp_deserializer__resolve(buffer, (void **)array);
   if (*array == NULL)
     return;
 
   svn_temp_deserializer__resolve(*array, (void **)&(*array)->elts);
-  (*array)->pool = pool;
+  (*array)->pool = result_pool;
 }
 
 /* auxilliary structure representing the content of a directory array */
@@ -293,13 +293,15 @@ serialize_dir(apr_array_header_t *entrie
 }
 
 /* Utility function to reconstruct a dir entries array from serialized data
- * in BUFFER and DIR_DATA. Allocation will be made form POOL.
+ * in BUFFER and DIR_DATA. Allocation will be made form RESULT_POOL.
  */
 static apr_array_header_t *
-deserialize_dir(void *buffer, dir_data_t *dir_data, apr_pool_t *pool)
+deserialize_dir(void *buffer,
+                dir_data_t *dir_data,
+                apr_pool_t *result_pool)
 {
-  apr_array_header_t *result
-    = apr_array_make(pool, dir_data->count, sizeof(svn_fs_x__dirent_t *));
+  apr_array_header_t *result = apr_array_make(result_pool, dir_data->count,
+                                              sizeof(svn_fs_x__dirent_t *));
   apr_size_t i;
   apr_size_t count;
   svn_fs_x__dirent_t *entry;
@@ -455,7 +457,7 @@ svn_error_t *
 svn_fs_x__deserialize_txdelta_window(void **item,
                                      void *buffer,
                                      apr_size_t buffer_size,
-                                     apr_pool_t *pool)
+                                     apr_pool_t *result_pool)
 {
   svn_txdelta_window_t *window;
 
@@ -497,9 +499,10 @@ svn_error_t *
 svn_fs_x__deserialize_manifest(void **out,
                                void *data,
                                apr_size_t data_len,
-                               apr_pool_t *pool)
+                               apr_pool_t *result_pool)
 {
-  apr_array_header_t *manifest = apr_array_make(pool, 1, sizeof(apr_off_t));
+  apr_array_header_t *manifest
+    = apr_array_make(result_pool, 1, sizeof(apr_off_t));
 
   manifest->nelts = (int) (data_len / sizeof(apr_off_t));
   manifest->nalloc = (int) (data_len / sizeof(apr_off_t));
@@ -615,9 +618,9 @@ svn_error_t *
 svn_fs_x__deserialize_properties(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool)
+                                 apr_pool_t *result_pool)
 {
-  apr_hash_t *hash = svn_hash__make(pool);
+  apr_hash_t *hash = svn_hash__make(result_pool);
   properties_data_t *properties = (properties_data_t *)data;
   size_t i;
 
@@ -679,7 +682,7 @@ svn_error_t *
 svn_fs_x__deserialize_node_revision(void **item,
                                     void *buffer,
                                     apr_size_t buffer_size,
-                                    apr_pool_t *pool)
+                                    apr_pool_t *result_pool)
 {
   /* Copy the _full_ buffer as it also contains the sub-structures. */
   svn_fs_x__noderev_t *noderev = (svn_fs_x__noderev_t *)buffer;
@@ -727,13 +730,13 @@ svn_error_t *
 svn_fs_x__deserialize_dir_entries(void **out,
                                   void *data,
                                   apr_size_t data_len,
-                                  apr_pool_t *pool)
+                                  apr_pool_t *result_pool)
 {
   /* Copy the _full_ buffer as it also contains the sub-structures. */
   dir_data_t *dir_data = (dir_data_t *)data;
 
   /* reconstruct the hash from the serialized data */
-  *out = deserialize_dir(dir_data, dir_data, pool);
+  *out = deserialize_dir(dir_data, dir_data, result_pool);
 
   return SVN_NO_ERROR;
 }
@@ -1052,9 +1055,9 @@ svn_error_t *
 svn_fs_x__deserialize_rep_header(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool)
+                                 apr_pool_t *result_pool)
 {
-  svn_fs_x__rep_header_t *copy = apr_palloc(pool, sizeof(*copy));
+  svn_fs_x__rep_header_t *copy = apr_palloc(result_pool, sizeof(*copy));
   SVN_ERR_ASSERT(data_len == sizeof(*copy));
 
   *copy = *(svn_fs_x__rep_header_t *)data;
@@ -1165,11 +1168,11 @@ svn_error_t *
 svn_fs_x__deserialize_changes(void **out,
                               void *data,
                               apr_size_t data_len,
-                              apr_pool_t *pool)
+                              apr_pool_t *result_pool)
 {
   int i;
   changes_data_t *changes = (changes_data_t *)data;
-  apr_array_header_t *array = apr_array_make(pool, 0,
+  apr_array_header_t *array = apr_array_make(result_pool, 0,
                                              sizeof(svn_fs_x__change_t *));
 
   /* de-serialize our auxiliary data structure */
@@ -1302,7 +1305,7 @@ svn_error_t *
 svn_fs_x__deserialize_mergeinfo(void **out,
                                 void *data,
                                 apr_size_t data_len,
-                                apr_pool_t *pool)
+                                apr_pool_t *result_pool)
 {
   unsigned i;
   int k, n;
@@ -1317,10 +1320,10 @@ svn_fs_x__deserialize_mergeinfo(void **o
 
   /* de-serialize keys and add entries to the result */
   n = 0;
-  mergeinfo = svn_hash__make(pool);
+  mergeinfo = svn_hash__make(result_pool);
   for (i = 0; i < merges->count; ++i)
     {
-      svn_rangelist_t *ranges = apr_array_make(pool,
+      svn_rangelist_t *ranges = apr_array_make(result_pool,
                                                merges->range_counts[i],
                                                sizeof(svn_merge_range_t*));
       for (k = 0; k < merges->range_counts[i]; ++k, ++n)

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.h?rev=1671314&r1=1671313&r2=1671314&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.h (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.h Sat Apr  4 20:33:13
2015
@@ -46,12 +46,12 @@ svn_fs_x__serialize_apr_array(struct svn
 
 /**
  * Deserialize APR @a *array within the @a buffer.  Set its pool member to
- * @a pool.  The elements within the array must not contain pointers.
+ * @a result_pool.  The elements within the array must not contain pointers.
  */
 void
 svn_fs_x__deserialize_apr_array(void *buffer,
                                 apr_array_header_t **array,
-                                apr_pool_t *pool);
+                                apr_pool_t *result_pool);
 
 
 /**
@@ -88,7 +88,7 @@ svn_error_t *
 svn_fs_x__deserialize_txdelta_window(void **item,
                                      void *buffer,
                                      apr_size_t buffer_size,
-                                     apr_pool_t *pool);
+                                     apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__serialize_func_t for a manifest
@@ -108,7 +108,7 @@ svn_error_t *
 svn_fs_x__deserialize_manifest(void **out,
                                void *data,
                                apr_size_t data_len,
-                               apr_pool_t *pool);
+                               apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__serialize_func_t for a properties hash
@@ -128,7 +128,7 @@ svn_error_t *
 svn_fs_x__deserialize_properties(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool);
+                                 apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__serialize_func_t for #svn_fs_x__noderev_t
@@ -146,7 +146,7 @@ svn_error_t *
 svn_fs_x__deserialize_node_revision(void **item,
                                     void *buffer,
                                     apr_size_t buffer_size,
-                                    apr_pool_t *pool);
+                                    apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__serialize_func_t for a directory contents array
@@ -164,7 +164,7 @@ svn_error_t *
 svn_fs_x__deserialize_dir_entries(void **out,
                                   void *data,
                                   apr_size_t data_len,
-                                  apr_pool_t *pool);
+                                  apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__partial_getter_func_t.  Set (apr_off_t) @a *out
@@ -242,7 +242,7 @@ svn_error_t *
 svn_fs_x__deserialize_rep_header(void **out,
                                  void *data,
                                  apr_size_t data_len,
-                                 apr_pool_t *pool);
+                                 apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__serialize_func_t for an #apr_array_header_t of
@@ -262,7 +262,7 @@ svn_error_t *
 svn_fs_x__deserialize_changes(void **out,
                               void *data,
                               apr_size_t data_len,
-                              apr_pool_t *pool);
+                              apr_pool_t *result_pool);
 
 /**
  * Implements #svn_cache__serialize_func_t for #svn_mergeinfo_t objects.
@@ -280,6 +280,6 @@ svn_error_t *
 svn_fs_x__deserialize_mergeinfo(void **out,
                                 void *data,
                                 apr_size_t data_len,
-                                apr_pool_t *pool);
+                                apr_pool_t *result_pool);
 
 #endif



Mime
View raw message