svn commit: r1094000 - in /subversion/trunk/subversion: include/private/svn_temp_serializer.h libsvn_subr/svn_temp_serializer.c

[st...@apache.org]

Author: stefan2
Date: Sat Apr 16 13:56:30 2011
New Revision: 1094000

URL: http://svn.apache.org/viewvc?rev=1094000&view=rev
Log:
Fix conversion warnings by changing the svn_temp_serializer__init_append API.

* subversion/include/private/svn_temp_serializer.h
  (svn_temp_serializer__init_append): both data blocks overlap and are mutable
* subversion/libsvn_subr/svn_temp_serializer.c
  (svn_temp_serializer__init_append): adapt; fix pointer arithmetics

Modified:
    subversion/trunk/subversion/include/private/svn_temp_serializer.h
    subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c

Modified: subversion/trunk/subversion/include/private/svn_temp_serializer.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_temp_serializer.h?rev=1094000&r1=1093999&r2=1094000&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_temp_serializer.h (original)
+++ subversion/trunk/subversion/include/private/svn_temp_serializer.h Sat Apr 16 13:56:30 2011
@@ -90,8 +90,8 @@ svn_temp_serializer__init(const void *so
  * @return the serization context.
  */
 svn_temp_serializer__context_t *
-svn_temp_serializer__init_append(const void *buffer,
-                                 const void *source_struct,
+svn_temp_serializer__init_append(void *buffer,
+                                 void *source_struct,
                                  apr_size_t currently_used,
                                  apr_size_t currently_allocated,
                                  apr_pool_t *pool);

Modified: subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c?rev=1094000&r1=1093999&r2=1094000&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c (original)
+++ subversion/trunk/subversion/libsvn_subr/svn_temp_serializer.c Sat Apr 16 13:56:30 2011
@@ -141,8 +141,8 @@ svn_temp_serializer__init(const void *so
  * Otherwise, set it to 0. All allocations will be made from POOl.
  */
 svn_temp_serializer__context_t *
-svn_temp_serializer__init_append(const void *buffer,
-                                 const void *source_struct,
+svn_temp_serializer__init_append(void *buffer,
+                                 void *source_struct,
                                  apr_size_t currently_used,
                                  apr_size_t currently_allocated,
                                  apr_pool_t *pool)
@@ -165,7 +165,7 @@ svn_temp_serializer__init_append(const v
   /* SOURCE_STRUCT is our serialization root */
   context->source = apr_palloc(pool, sizeof(*context->source));
   context->source->source_struct = source_struct;
-  context->source->target_offset = source_struct - buffer;
+  context->source->target_offset = (char *)source_struct - (char *)buffer;
   context->source->upper = NULL;
 
   /* done */