Author: stefan2
Date: Thu Feb 26 21:25:50 2015
New Revision: 1662572
URL: http://svn.apache.org/r1662572
Log:
On the fsx-1.10 branch:
* subversion/libsvn_fs_x/temp_serializer.c
(svn_fs_x__combine_number_and_string): The pool is a result-only pool.
* subversion/libsvn_fs_x/temp_serializer.h
(svn_fs_x__combine_number_and_string): Sync with implementation.
Modified:
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/temp_serializer.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/temp_serializer.c?rev=1662572&r1=1662571&r2=1662572&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 Thu
Feb 26 21:25:50 2015
@@ -71,13 +71,13 @@ encode_number(apr_int64_t number, char *
const char*
svn_fs_x__combine_number_and_string(apr_int64_t number,
const char *string,
- apr_pool_t *pool)
+ apr_pool_t *result_pool)
{
apr_size_t len = strlen(string);
/* number part requires max. 10x7 bits + 1 space.
* Add another 1 for the terminal 0 */
- char *key_buffer = apr_palloc(pool, len + 12);
+ char *key_buffer = apr_palloc(result_pool, len + 12);
const char *key = key_buffer;
/* Prepend the number to the string and separate them by space. No other
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=1662572&r1=1662571&r2=1662572&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 Thu
Feb 26 21:25:50 2015
@@ -29,12 +29,12 @@
/**
* Prepend the @a number to the @a string in a space efficient way such that
* no other (number,string) combination can produce the same result.
- * Allocate temporaries as well as the result from @a pool.
+ * Allocate the result from @a result_pool.
*/
const char*
svn_fs_x__combine_number_and_string(apr_int64_t number,
const char *string,
- apr_pool_t *pool);
+ apr_pool_t *result_pool);
/**
* Serialize a @a noderev_p within the serialization @a context.
