Changeset 7146789f5fd7e837313f69da8c772ebb67b80ec1

Timestamp:

08/03/06 12:32:34 (3 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1141817554 +0000

git-parent:

[d3de78aa5fb85672dda1bd221b29776603575cc2]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1141817554 +0000

Message:

i18n_atof(): locale-agnostic atof()

Files:

• include/charset.h (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/misc/charset.c (modified) (2 diffs)
• src/test/i18n_atof.c (added)

include/charset.h

@@ -50 +50 @@
-VLC_EXPORT( char *, __vlc_fix_readdir_charset, ( vlc_object_t *, const char * ) );
-#define vlc_fix_readdir_charset(a,b) __vlc_fix_readdir_charset(VLC_OBJECT(a),b)
+extern double i18n_atof( const char * );
-
-# ifdef __cplusplus

src/Makefile.am

@@ -373 +373 @@
-    touch stamp-api
-
+###############################################################################
+# Unit/regression test
+###############################################################################
+if USE_LIBTOOL
+check_PROGRAMS = test_i18n_atof
+TESTS = $(check_PROGRAMS)
+
+CFLAGS_tests = `$(VLC_CONFIG) --cflags vlc`
+
+test_i18n_atof_SOURCES = test/i18n_atof.c
+test_i18n_atof_LDADD = libvlc.la
+test_i18n_atof_CFLAGS = $(CFLAGS_tests)
+endif
+

src/misc/charset.c

@@ -1 +1 @@
-/*****************************************************************************
-
-
+
- *****************************************************************************
-
+
+
+
- * $Id$
- *
-
+
+
+
- *
- * vlc_current_charset() an adaption of mp_locale_charset():
@@ -372 +375 @@
-    return strdup( psz_string );
-}
+
+/**
+ * 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_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 )
+{
+    char *end;
+    double d = strtod( str, &end );
+
+    if(( *end == ',' ) || ( *end == '.' ))
+    {
+        char *dup = strdup( str );
+
+        if( dup == NULL )
+            return d;
+
+        dup[end - str] = ( *end == ',' ) ? '.' : ',';
+        d = strtod( dup, &end );
+        free( dup );
+    }
+    return d;
+}