#ifdef __APPLE__
# include <errno.h>
# include <string.h>
+# include <xlocale.h>
#endif
#include <vlc_charset.h>
/**
- * There are two decimal separators in the computer world-wide locales:
- * dot (which is the american default), and comma (which is used in France,
- * the country with the most VLC developers, among others).
- *
- * i18n_strtod() has the same prototype as ANSI C strtod() but it accepts
- * either decimal separator when deserializing the string to a float number,
- * independant of the local computer setting.
+ * us_strtod() has the same prototype as ANSI C strtod() but it uses the
+ * POSIX/C decimal format, regardless of the current numeric locale.
*/
-double i18n_strtod( const char *str, char **end )
+double us_strtod( const char *str, char **end )
{
- char *end_buf, e;
- double d;
-
- if( end == NULL )
- end = &end_buf;
- d = strtod( str, end );
+ locale_t loc = newlocale (LC_NUMERIC_MASK, "C", NULL);
+ locale_t oldloc = uselocale (loc);
+ double res = strtod (str, end);
- e = **end;
- if(( e == ',' ) || ( e == '.' ))
+ if (loc != (locale_t)0)
{
- char dup[strlen( str ) + 1];
- strcpy( dup, str );
-
- if( dup == NULL )
- return d;
-
- dup[*end - str] = ( e == ',' ) ? '.' : ',';
- d = strtod( dup, end );
+ uselocale (oldloc);
+ freelocale (loc);
}
- return d;
-}
-
-/**
- * i18n_atof() has the same prototype as ANSI C atof() but it accepts
- * either decimal separator when deserializing the string to a float number,
- * independant of the local computer setting.
- */
-double i18n_atof( const char *str )
-{
- return i18n_strtod( str, NULL );
-}
-
-
-/**
- * us_strtod() has the same prototype as ANSI C strtod() but it expects
- * a dot as decimal separator regardless of the system locale.
- */
-double us_strtod( const char *str, char **end )
-{
- char dup[strlen( str ) + 1], *ptr;
- double d;
- strcpy( dup, str );
-
- ptr = strchr( dup, ',' );
- if( ptr != NULL )
- *ptr = '\0';
-
- d = strtod( dup, &ptr );
- if( end != NULL )
- *end = (char *)&str[ptr - dup];
-
- return d;
+ return res;
}
/**