2006-10-19 Han-Wen Nienhuys <hanwen@lilypond.org>
+ * flower/string-convert.cc (dec2double): clean-up warnings.
+
* configure.in (CXXFLAGS): add -Werror.
* VERSION (PACKAGE_NAME): release 2.9.25
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);
+
return (int)l;
}
{
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;
}
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;
}