X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Ffile-cookie.cc;h=762acb1c065d210f92bc3ba0bf1c1087810f3a6c;hb=b872748c6aa8bb721ced458691b38ac2fac5dfc8;hp=8f4c9c4f85be8372c6407808090d7c38bc54a6f1;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git

diff --git a/flower/file-cookie.cc b/flower/file-cookie.cc
index 8f4c9c4f85..762acb1c06 100644
--- a/flower/file-cookie.cc
+++ b/flower/file-cookie.cc
@@ -7,7 +7,7 @@ using namespace std;
 
 extern "C" {
 
-  static bool
+  bool
   is_memory_stream (void *foo)
   {
     Memory_out_stream *cookie = (Memory_out_stream *) foo;
@@ -15,24 +15,22 @@ extern "C" {
   }
 
   void *
-  lily_fopencookie (void *cookie, char const *modes,
-		    lily_cookie_io_functions_t io_funcs)
+  lily_fopencookie (void *cookie,
+                    char const * /* modes */,
+                    lily_cookie_io_functions_t /* io_funcs */)
   {
-    (void) cookie;
-    (void) modes;
-    (void) io_funcs;
     assert (is_memory_stream (cookie));
     return (FILE *) cookie;
   }
 
-  int
+  ssize_t
   lily_cookie_fclose (void *file)
   {
     assert (is_memory_stream (file));
     return Memory_out_stream::cleaner (file);
   }
 
-  int
+  ssize_t
   lily_cookie_fprintf (void *file, char const *format, ...)
   {
     assert (is_memory_stream (file));
@@ -41,13 +39,13 @@ 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);
   }
 
-  int
+  ssize_t
   lily_cookie_putc (int c, void *file)
   {
     assert (is_memory_stream (file));