svn commit: r986492 - /subversion/branches/performance/subversion/libsvn_subr/stream.c

[st...@apache.org]

Author: stefan2
Date: Tue Aug 17 21:28:04 2010
New Revision: 986492

URL: http://svn.apache.org/viewvc?rev=986492&view=rev
Log:
Fix signedness and integer size mismatches.

* subversion/libsvn_subr/stream.c
  (stream_readline_chunky, skip_handler_apr): fix integer usage

Modified:
    subversion/branches/performance/subversion/libsvn_subr/stream.c

Modified: subversion/branches/performance/subversion/libsvn_subr/stream.c
URL: http://svn.apache.org/viewvc/subversion/branches/performance/subversion/libsvn_subr/stream.c?rev=986492&r1=986491&r2=986492&view=diff
==============================================================================
--- subversion/branches/performance/subversion/libsvn_subr/stream.c (original)
+++ subversion/branches/performance/subversion/libsvn_subr/stream.c Tue Aug 17 21:28:04 2010
@@ -376,7 +376,7 @@ stream_readline_chunky(svn_stringbuf_t *
   svn_stream_mark_t *mark;
   apr_size_t numbytes;
   const char *eol_pos;
-  apr_off_t total_parsed = 0;
+  apr_size_t total_parsed = 0;
 
   /* invariant for this call */
   size_t eol_len = strlen(eol);
@@ -880,7 +880,12 @@ static svn_error_t *
 skip_handler_apr(void *baton, apr_size_t *count)
 {
   struct baton_apr *btn = baton;
-  return svn_io_file_seek(btn->file, SEEK_CUR, count, btn->pool);
+  apr_off_t offset = *count;
+
+  SVN_ERR(svn_io_file_seek(btn->file, SEEK_CUR, &offset, btn->pool));
+  *count = offset;
+
+  return SVN_NO_ERROR;
 }
 
 static svn_error_t *