]> git.donarmstrong.com Git - lilypond.git/commitdiff
Avoid conversion changing signedness
authorGraham Percival <graham@percival-music.ca>
Thu, 8 Dec 2011 11:05:32 +0000 (03:05 -0800)
committerGraham Percival <graham@percival-music.ca>
Wed, 14 Dec 2011 09:51:06 +0000 (01:51 -0800)
/home/gperciva/src/lilypond/flower/file-cookie.cc:45:50: error: implicit
      conversion changes signedness: 'int' to 'size_t' (aka 'unsigned long')
      [-Werror,-Wsign-conversion]
    return Memory_out_stream::writer (file, buf, i);
           ~~~~~~~~~~~~~~~~~                     ^

flower/file-cookie.cc

index 90aa5c908d0906e320d61116f8525b52db0b484a..762acb1c065d210f92bc3ba0bf1c1087810f3a6c 100644 (file)
@@ -39,10 +39,10 @@ extern "C" {
 
     static char buf[65536];
     int i = vsnprintf (buf, sizeof (buf), format, ap);
-    if (i == -1 || (unsigned) i > sizeof (buf))
+    if (i < 0 || (unsigned) i > sizeof (buf))
       assert (false);
     va_end (ap);
-    return Memory_out_stream::writer (file, buf, i);
+    return Memory_out_stream::writer (file, buf, (unsigned)i);
   }
 
   ssize_t