subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1509229 - /subversion/branches/fsx/subversion/libsvn_subr/packed_data.c
Date Thu, 01 Aug 2013 13:30:57 GMT
Author: stefan2
Date: Thu Aug  1 13:30:57 2013
New Revision: 1509229

URL: http://svn.apache.org/r1509229
Log:
On the fsx branch:  Fix the issues in our svn_packed_data__* code
discovered by our new tests.

* subversion/libsvn_subr/packed_data.c
  (svn_packed__byte_stream_t,
   write_byte_stream_structure): byte streams don't have sub-streams
  (svn_packed__data_fill_buffer): fix unpacking of deltified (u/)ints
  (read_byte_stream_structure): must read the sub-stream count even if it's 0

Modified:
    subversion/branches/fsx/subversion/libsvn_subr/packed_data.c

Modified: subversion/branches/fsx/subversion/libsvn_subr/packed_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx/subversion/libsvn_subr/packed_data.c?rev=1509229&r1=1509228&r2=1509229&view=diff
==============================================================================
--- subversion/branches/fsx/subversion/libsvn_subr/packed_data.c (original)
+++ subversion/branches/fsx/subversion/libsvn_subr/packed_data.c Thu Aug  1 13:30:57 2013
@@ -92,9 +92,6 @@ struct svn_packed__byte_stream_t
   /* Last sub-stream, if any.  NULL otherwise. */
   svn_packed__byte_stream_t *last_substream;
 
-  /* Number of sub-streams. */
-  apr_size_t substream_count;
-  
   /* Next (sibling) byte sequence stream, if any.  NULL otherwise. */
   svn_packed__byte_stream_t *next;
 
@@ -440,7 +437,7 @@ write_byte_stream_structure(svn_stringbu
   for (; stream; stream = stream->next)
     {
       /* this stream's structure and size */
-      write_packed_uint(tree_struct, stream->substream_count);
+      write_packed_uint(tree_struct, 0);
       write_packed_uint(tree_struct, stream->lengths_stream_index);
       write_packed_uint(tree_struct, stream->packed->len);
 
@@ -812,7 +809,7 @@ svn_packed__data_fill_buffer(svn_packed_
           for (i = end; i > 0; --i)
             {
               apr_uint64_t temp = stream->buffer[i-1];
-              temp = (temp % 2) ? 0 - (temp + 1) / 2 : temp / 2;
+              temp = (temp % 2) ? -1 - temp / 2 : temp / 2;
               last_value += temp;
               stream->buffer[i-1] = last_value;
             }
@@ -824,7 +821,7 @@ svn_packed__data_fill_buffer(svn_packed_
       if (!private_data->diff && private_data->is_signed)
         for (i = 0; i < end; ++i)
           stream->buffer[i] = (stream->buffer[i] % 2)
-                            ? 0 - (stream->buffer[i] + 1) / 2
+                            ? -1 - stream->buffer[i] / 2
                             : stream->buffer[i] / 2;
     }
 
@@ -911,7 +908,7 @@ read_byte_stream_structure(svn_stringbuf
                            svn_packed__int_stream_t *first_int_stream)
 {
   /* read parameters from the TREE_STRUCT buffer */
-  apr_size_t substream_count = (apr_size_t)read_packed_uint(tree_struct);
+  apr_size_t dummy = (apr_size_t)read_packed_uint(tree_struct);
   apr_size_t lengths_stream_index = (apr_size_t)read_packed_uint(tree_struct);
   apr_size_t packed_size = (apr_size_t)read_packed_uint(tree_struct);
   apr_size_t i;



Mime
View raw message