declare print_property_callback_stack() inside NDEBUG

[lilypond.git] / flower / string-convert.cc

diff --git a/flower/string-convert.cc b/flower/string-convert.cc
index f9449363f04eacea19d94f88ddda8855af5d9400..6a6dbc6d7c655882d9ec18f1415b5dc9d5a6d1d0 100644 (file)
--- a/flower/string-convert.cc
+++ b/flower/string-convert.cc
@@ -66,7 +66,6 @@ String_convert::bin2unsigned (string bin_string)
   return result_u;
 }
 
-// breendet imp from string
 int
 String_convert::dec2int (string dec_string)
 {
@@ -74,9 +73,11 @@ String_convert::dec2int (string dec_string)
     return 0;
 
   long l = 0;
-  int conv = sscanf (dec_string.c_str (), "%ld", &l);
-  assert (conv);
+  if (!sscanf (dec_string.c_str (), "%ld", &l))
+    assert (false);
 
+  assert (form_string ("%ld", l) == dec_string);
+  
   return (int)l;
 }
 
@@ -94,9 +95,11 @@ String_convert::dec2double (string dec_string)
 {
   if (!dec_string.length ())
     return 0;
-  double d = 0;
-  int conv = sscanf (dec_string.c_str (), "%lf", &d);
-  assert (conv);
+  
+  double d = 0.0;
+  if (!sscanf (dec_string.c_str (), "%lf", &d))
+    assert (false);
+  
   return d;
 }
 
@@ -125,10 +128,10 @@ string
 String_convert::hex2bin (string hex_string)
 {
   string str;
-  //  silly, asserts should alway be "on"!
-  //    assert (!hex2bin (hex_string, str) );
-  int error_i = hex2bin (hex_string, str);
-  assert (!error_i);
+
+  if (hex2bin (hex_string, str))
+    assert (false);
+  
   return str;
 }