]> git.donarmstrong.com Git - lilypond.git/commitdiff
Avoid implicit sign conversion: size_t vs. ssize_t
authorGraham Percival <graham@percival-music.ca>
Thu, 15 Dec 2011 14:41:07 +0000 (06:41 -0800)
committerGraham Percival <graham@percival-music.ca>
Mon, 9 Jan 2012 06:08:41 +0000 (06:08 +0000)
flower/memory-stream.cc

index 9d4c747ef5a41e231a4992b3ebf230c71304bdfd..b034f85e5e8b35622121d70bbf3b9c83612e581f 100644 (file)
@@ -93,7 +93,7 @@ Memory_out_stream::writer (void *cookie,
 {
   Memory_out_stream *stream = (Memory_out_stream *) cookie;
 
-  ssize_t newsize = stream->size_ + size;
+  ssize_t newsize = stream->size_ + (ssize_t) size;
 
   bool change = false;
   while (newsize > stream->buffer_blocks_ * block_size_)
@@ -105,12 +105,12 @@ Memory_out_stream::writer (void *cookie,
 
   if (change)
     stream->buffer_ = (char *) realloc (stream->buffer_,
-                                        stream->buffer_blocks_ * block_size_);
+                                        (size_t) (stream->buffer_blocks_ * block_size_));
 
   memcpy (stream->buffer_ + stream->size_, buffer, size);
   stream->size_ = newsize;
 
-  return size;
+  return (ssize_t) size;
 }
 
 ssize_t