subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1671333 - in /subversion/branches/fsx-1.10/subversion/libsvn_fs_x: changes.c changes.h
Date Sat, 04 Apr 2015 21:15:02 GMT
Author: stefan2
Date: Sat Apr  4 21:15:01 2015
New Revision: 1671333

URL: http://svn.apache.org/r1671333
Log:
On the fsx-1.10 branch:
In FSX changes container code, name result pools properly.

* subversion/libsvn_fs_x/changes.c
  (svn_fs_x__changes_get_list): POOL is a pure RESULT_POOL.

* subversion/libsvn_fs_x/changes.h
  (svn_fs_x__changes_get_list): Sync. declaration with implementation.

Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.c
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/changes.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=1671333&r1=1671332&r2=1671333&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 21:15:01 2015
@@ -222,7 +222,7 @@ svn_error_t *
 svn_fs_x__changes_get_list(apr_array_header_t **list,
                            const svn_fs_x__changes_t *changes,
                            apr_size_t idx,
-                           apr_pool_t *pool)
+                           apr_pool_t *result_pool)
 {
   int first;
   int last;
@@ -235,7 +235,7 @@ svn_fs_x__changes_get_list(apr_array_hea
   /* validate index */
   if (idx + 1 >= (apr_size_t)changes->offsets->nelts)
     return svn_error_createf(SVN_ERR_FS_CONTAINER_INDEX, NULL,
-                             apr_psprintf(pool,
+                             apr_psprintf(result_pool,
                                           _("Changes list index %%%s"
                                             " exceeds container size %%d"),
                                           APR_SIZE_T_FMT),
@@ -246,18 +246,19 @@ svn_fs_x__changes_get_list(apr_array_hea
   last = APR_ARRAY_IDX(changes->offsets, (int)idx + 1, int);
 
   /* construct result */
-  *list = apr_array_make(pool, last - first, sizeof(svn_fs_x__change_t*));
+  *list = apr_array_make(result_pool, last - first,
+                         sizeof(svn_fs_x__change_t*));
   for (i = first; i < last; ++i)
     {
       const binary_change_t *binary_change
         = &APR_ARRAY_IDX(changes->changes, i, binary_change_t);
 
       /* convert BINARY_CHANGE into a standard FSX svn_fs_x__change_t */
-      svn_fs_x__change_t *change = apr_pcalloc(pool, sizeof(*change));
+      svn_fs_x__change_t *change = apr_pcalloc(result_pool, sizeof(*change));
       change->path.data = svn_fs_x__string_table_get(changes->paths,
                                                      binary_change->path,
                                                      &change->path.len,
-                                                     pool);
+                                                     result_pool);
 
       if (binary_change->noderev_id.change_set != SVN_FS_X__INVALID_CHANGE_SET)
         change->noderev_id = binary_change->noderev_id;
@@ -276,7 +277,7 @@ svn_fs_x__changes_get_list(apr_array_hea
           = svn_fs_x__string_table_get(changes->paths,
                                         binary_change->copyfrom_path,
                                         NULL,
-                                        pool);
+                                        result_pool);
 
       /* add it to the result */
       APR_ARRAY_PUSH(*list, svn_fs_x__change_t*) = change;

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=1671333&r1=1671332&r2=1671333&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 21:15:01 2015
@@ -78,7 +78,7 @@ svn_error_t *
 svn_fs_x__changes_get_list(apr_array_header_t **list,
                            const svn_fs_x__changes_t *changes,
                            apr_size_t idx,
-                           apr_pool_t *pool);
+                           apr_pool_t *result_pool);
 
 /* I/O interface. */
 



Mime
View raw message