svn commit: r1405538 - in /subversion/trunk/subversion: libsvn_client/patch.c libsvn_delta/text_delta.c libsvn_subr/spillbuf.c

[st...@apache.org]

Author: stefan2
Date: Sun Nov  4 12:01:06 2012
New Revision: 1405538

URL: http://svn.apache.org/viewvc?rev=1405538&view=rev
Log:
Final batch of size conversion fixes.

* subversion/libsvn_subr/spillbuf.c
  (read_data): fix conversion warnings for all sign & size combinations
* subversion/libsvn_client/patch.c
  (readline_prop): ditto
* subversion/libsvn_delta/text_delta.c
  (apply_window): txdelta uses in-memory buffers

Modified:
    subversion/trunk/subversion/libsvn_client/patch.c
    subversion/trunk/subversion/libsvn_delta/text_delta.c
    subversion/trunk/subversion/libsvn_subr/spillbuf.c

Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=1405538&r1=1405537&r2=1405538&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Sun Nov  4 12:01:06 2012
@@ -542,7 +542,7 @@ readline_prop(void *baton, svn_stringbuf
 
   str = svn_stringbuf_create_ensure(80, result_pool);
 
-  if (b->offset >= b->value->len)
+  if ((apr_uint64_t)b->offset >= (apr_uint64_t)b->value->len)
     {
       *eol_str = NULL;
       *eof = TRUE;

Modified: subversion/trunk/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/text_delta.c?rev=1405538&r1=1405537&r2=1405538&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/trunk/subversion/libsvn_delta/text_delta.c Sun Nov  4 12:01:06 2012
@@ -801,7 +801,8 @@ apply_window(svn_txdelta_window_t *windo
 
       /* If the existing view overlaps with the new view, copy the
        * overlap to the beginning of the new buffer.  */
-      if (ab->sbuf_offset + ab->sbuf_len > window->sview_offset)
+      if (  (apr_size_t)ab->sbuf_offset + ab->sbuf_len
+          > (apr_size_t)window->sview_offset)
         {
           apr_size_t start =
             (apr_size_t)(window->sview_offset - ab->sbuf_offset);

Modified: subversion/trunk/subversion/libsvn_subr/spillbuf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/spillbuf.c?rev=1405538&r1=1405537&r2=1405538&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/spillbuf.c (original)
+++ subversion/trunk/subversion/libsvn_subr/spillbuf.c Sun Nov  4 12:01:06 2012
@@ -290,7 +290,7 @@ read_data(struct memblock_t **mem,
   *mem = get_buffer(buf);
   /* NOTE: mem's size/next are uninitialized.  */
 
-  if (buf->spill_size < buf->blocksize)
+  if ((apr_uint64_t)buf->spill_size < (apr_uint64_t)buf->blocksize)
     (*mem)->size = (apr_size_t)buf->spill_size;
   else
     (*mem)->size = buf->blocksize;  /* The size of (*mem)->data  */