From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Fri, 7 Jan 2005 16:13:14 +0000 (+0000)
Subject: * lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).
X-Git-Tag: release/2.5.14~295
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8f67218c22caacba22c4bb1ffcdbb6245484a047;p=lilypond.git

* lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).
Add headers.

* lily/GNUmakefile (general-scheme.o): Add version.hh dependency.
---

diff --git a/ChangeLog b/ChangeLog
index 01f49ec84f..9078c35e0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-01-07  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).
+	Add headers.
+
+	* lily/GNUmakefile (general-scheme.o): Add version.hh dependency.
+
 2005-01-07  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 	* mf/GNUmakefile (debian-mirror): rename bigcheese to emmentaler.
diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 6e964e038f..24c14b1ec8 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -29,6 +29,7 @@ $(outdir)/lily-parser.o: $(outdir)/parser.hh
 $(outdir)/lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
+$(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index 895bf04365..727bdeb73b 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -7,8 +7,13 @@
                  Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
+#include "config.hh"
+
 #include <math.h>   /* isinf */
+#include <stdio.h>
+#include <libintl.h> 		// gettext on macos x
 
+#include "libc-extension.hh"
 #include "lily-guile.hh"
 #include "string.hh"
 #include "misc.hh"
@@ -115,10 +120,10 @@ LY_DEFINE (ly_number2string, "ly:number->string",
 	  r = 0.0;
 	}
 
-      sprintf (str, "%08.4f", r);
+      snprintf (str, sizeof (str), "%08.4f", r);
     }
   else
-    sprintf (str, "%d", scm_to_int (s));
+    snprintf (str, sizeof (str), "%d", scm_to_int (s));
 
   return scm_makfrom0str (str);
 }