X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fwarn.cc;h=24e52939470b588ed4dc75ea4250fe544ef05795;hb=32f10f1e5741ddadbae0ed5d4bd3008a22fb6fb9;hp=40a2b8a3318a156ee3a71593240a83f09c80a718;hpb=eec76aa84a3e17ac58893e2d06f967debc1f74a9;p=lilypond.git

diff --git a/flower/warn.cc b/flower/warn.cc
index 40a2b8a331..24e5293947 100644
--- a/flower/warn.cc
+++ b/flower/warn.cc
@@ -3,14 +3,13 @@
 
   source file of the Flower Library
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "warn.hh"
 
+#include <cstdlib>
+#include <cstdio>
 
 void
 message (String s)
@@ -22,13 +21,13 @@ message (String s)
 void
 warning (String s)
 {
-  message (_f ("warning: %s\n", s.to_str0 ()));
+  message (_f ("warning: %s", s.to_str0 ()) + "\n");
 }
 
 void
 non_fatal_error (String s)
 {
-  message (_f ("error: %s\n", s.to_str0 ()));
+  message (_f ("error: %s", s.to_str0 ()) + "\n");
 }
 
 void
@@ -41,7 +40,7 @@ error (String s)
 void
 programming_error (String s)
 {
-  message (_f ("programming error: %s (Continuing; crossing fingers)\n",
-	       s.to_str0 ()));
+  message (_f ("programming error: %s", s) + "\n");
+  message (_ ("Continuing; crossing fingers") + "\n");
 }