From: Graham Percival <graham@percival-music.ca>
Date: Thu, 15 Dec 2011 14:41:07 +0000 (-0800)
Subject: Avoid implicit sign conversion: size_t vs. ssize_t
X-Git-Tag: release/2.15.25-1~24
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=17b654ec37966abda737e6df511ce5a7c962ec92;p=lilypond.git

Avoid implicit sign conversion: size_t vs. ssize_t
---

diff --git a/flower/memory-stream.cc b/flower/memory-stream.cc
index 9d4c747ef5..b034f85e5e 100644
--- a/flower/memory-stream.cc
+++ b/flower/memory-stream.cc
@@ -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