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 2011/05/18 15:24:34 UTC
svn commit: r1124255 - in /subversion/trunk/subversion:
include/private/svn_cache.h libsvn_fs_fs/dag.c libsvn_fs_fs/dag.h
libsvn_fs_fs/temp_serializer.c libsvn_fs_fs/temp_serializer.h
tests/libsvn_subr/cache-test.c
Author: stefan2
Date: Wed May 18 13:24:34 2011
New Revision: 1124255
URL: http://svn.apache.org/viewvc?rev=1124255&view=rev
Log:
Make the declaration of svn_cache__deserialize_func_t match its
actual usage: the DATA buffer going in is already a local copy and
the function should modify that buffer directly.
* include/private/svn_cache.h
(svn_cache__deserialize_func_t): remove "const"; adapt docstring
* subversion/libsvn_fs_fs/temp_serializer.h
(svn_fs_fs__deserialize_txdelta_window, svn_fs_fs__deserialize_manifest,
svn_fs_fs__deserialize_id, svn_fs_fs__deserialize_node_revision,
svn_fs_fs__deserialize_dir_entries): follow the prototype declaration
* subversion/libsvn_fs_fs/temp_serializer.c
(svn_fs_fs__deserialize_txdelta_window, svn_fs_fs__deserialize_manifest,
svn_fs_fs__deserialize_id, svn_fs_fs__deserialize_node_revision,
svn_fs_fs__deserialize_dir_entries): dito
* subversion/libsvn_fs_fs/dag.h
(svn_fs_fs__dag_deserialize): dito
* subversion/libsvn_fs_fs/dag.c
(svn_fs_fs__dag_deserialize): dito
* subversion/tests/libsvn_subr/cache-test.c
(deserialize_revnum): dito
Suggested by: danielsh
Modified:
subversion/trunk/subversion/include/private/svn_cache.h
subversion/trunk/subversion/libsvn_fs_fs/dag.c
subversion/trunk/subversion/libsvn_fs_fs/dag.h
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h
subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
Modified: subversion/trunk/subversion/include/private/svn_cache.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_cache.h?rev=1124255&r1=1124254&r2=1124255&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_cache.h (original)
+++ subversion/trunk/subversion/include/private/svn_cache.h Wed May 18 13:24:34 2011
@@ -50,10 +50,12 @@ extern "C" {
/**
* A function type for deserializing an object @a *out from the string
- * @a data of length @a data_len in the pool @a pool.
-*/
+ * @a data of length @a data_len in the pool @a pool. It is legal and
+ * generally suggested that the deserialization will be done in-place,
+ * i.e. modify @a data directly and return it in @a *out.
+ */
typedef svn_error_t *(*svn_cache__deserialize_func_t)(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs_fs/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/dag.c?rev=1124255&r1=1124254&r2=1124255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/dag.c Wed May 18 13:24:34 2011
@@ -1107,7 +1107,7 @@ svn_fs_fs__dag_serialize(char **data,
svn_error_t *
svn_fs_fs__dag_deserialize(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/libsvn_fs_fs/dag.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/dag.h?rev=1124255&r1=1124254&r2=1124255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/dag.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/dag.h Wed May 18 13:24:34 2011
@@ -90,7 +90,7 @@ svn_fs_fs__dag_serialize(char **data,
Implements svn_cache__deserialize_func_t */
svn_error_t *
svn_fs_fs__dag_deserialize(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c?rev=1124255&r1=1124254&r2=1124255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.c Wed May 18 13:24:34 2011
@@ -522,7 +522,7 @@ svn_fs_fs__serialize_txdelta_window(char
svn_error_t *
svn_fs_fs__deserialize_txdelta_window(void **item,
- const char *buffer,
+ char *buffer,
apr_size_t buffer_size,
apr_pool_t *pool)
{
@@ -564,7 +564,7 @@ svn_fs_fs__serialize_manifest(char **dat
svn_error_t *
svn_fs_fs__deserialize_manifest(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool)
{
@@ -605,7 +605,7 @@ svn_fs_fs__serialize_id(char **data,
svn_error_t *
svn_fs_fs__deserialize_id(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool)
{
@@ -648,7 +648,7 @@ svn_fs_fs__serialize_node_revision(char
svn_error_t *
svn_fs_fs__deserialize_node_revision(void **item,
- const char *buffer,
+ char *buffer,
apr_size_t buffer_size,
apr_pool_t *pool)
{
@@ -696,7 +696,7 @@ svn_fs_fs__serialize_dir_entries(char **
svn_error_t *
svn_fs_fs__deserialize_dir_entries(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool)
{
Modified: subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h?rev=1124255&r1=1124254&r2=1124255&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/temp_serializer.h Wed May 18 13:24:34 2011
@@ -88,7 +88,7 @@ svn_fs_fs__serialize_txdelta_window(char
*/
svn_error_t *
svn_fs_fs__deserialize_txdelta_window(void **item,
- const char *buffer,
+ char *buffer,
apr_size_t buffer_size,
apr_pool_t *pool);
@@ -108,7 +108,7 @@ svn_fs_fs__serialize_manifest(char **dat
*/
svn_error_t *
svn_fs_fs__deserialize_manifest(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool);
@@ -126,7 +126,7 @@ svn_fs_fs__serialize_id(char **data,
*/
svn_error_t *
svn_fs_fs__deserialize_id(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool);
@@ -144,7 +144,7 @@ svn_fs_fs__serialize_node_revision(char
*/
svn_error_t *
svn_fs_fs__deserialize_node_revision(void **item,
- const char *buffer,
+ char *buffer,
apr_size_t buffer_size,
apr_pool_t *pool);
@@ -162,7 +162,7 @@ svn_fs_fs__serialize_dir_entries(char **
*/
svn_error_t *
svn_fs_fs__deserialize_dir_entries(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool);
Modified: subversion/trunk/subversion/tests/libsvn_subr/cache-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/cache-test.c?rev=1124255&r1=1124254&r2=1124255&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/cache-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/cache-test.c Wed May 18 13:24:34 2011
@@ -51,7 +51,7 @@ serialize_revnum(char **data,
/* Implements svn_cache__deserialize_func_t */
static svn_error_t *
deserialize_revnum(void **out,
- const char *data,
+ char *data,
apr_size_t data_len,
apr_pool_t *pool)
{