Changeset cb63940a0b567471603b667c391770309ad15c31

Timestamp:

05/24/08 11:06:24 (4 months ago)

Author:

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

git-committer:

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

git-parent:

[2b617e77c1f838066916c4a46de7c0e99b38105c]

git-author:

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

Message:

Inline atoll and atof

Files:

• include/vlc_fixups.h (modified) (1 diff)
• src/extras/libc.c (modified) (2 diffs)
• src/libvlccore.sym (modified) (1 diff)

include/vlc_fixups.h

@@ -71 +71 @@
-#endif
-
-A
-atof vlc_atof
+STR
+strtof( a, b ) ((float)strtod (a, b))
-#endif
-
-
-
-
-
-
-
-
-
+
+
-#endif
-
-#ifndef HAVE_STRTOLL
-# define strtoll vlc_strtoll
+#endif
+
+#ifndef HAVE_ATOLL
+# define atoll( str ) (strtoll ((str), (char **)NULL, 10))
-#endif
-

src/extras/libc.c

@@ -227 +227 @@
-
-/*****************************************************************************
- * atof: convert a string to a double.
- *****************************************************************************/
-#if !defined( HAVE_ATOF )
-double vlc_atof( const char *nptr )
-{
-    double f_result;
-    wchar_t *psz_tmp = NULL;
-    int i_len = strlen( nptr ) + 1;
-
-    psz_tmp = malloc( i_len * sizeof(wchar_t) );
-    if( !psz_tmp )
-        return NULL;
-    MultiByteToWideChar( CP_ACP, 0, nptr, -1, psz_tmp, i_len );
-    f_result = wcstod( psz_tmp, NULL );
-    free( psz_tmp );
-
-    return f_result;
-}
-#endif
-
-/*****************************************************************************
- * strtoll: convert a string to a 64 bits int.
- *****************************************************************************/
@@ -319 +298 @@
-#endif
-
-/*****************************************************************************
- * atoll: convert a string to a 64 bits int.
- *****************************************************************************/
-#if !defined( HAVE_ATOLL )
-int64_t vlc_atoll( const char *nptr )
-{
-    return strtoll( nptr, (char **)NULL, 10 );
-}
-#endif
-
-/**
- * Copy a string to a sized buffer. The result is always nul-terminated

src/libvlccore.sym

@@ -372 +372 @@
-vlc_alphasort
-vlc_asprintf
-vlc_atof
-vlc_atoll
-vlc_b64_decode
-vlc_b64_decode_binary