Changeset b2656b1265dafffbe4d03f539399dceb639cc014

Timestamp:

01/10/04 13:11:37 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1096629097 +0000

git-parent:

[2ba646a5ea654996b0e627d589bd712acebb2bf8]

git-author:

Gildas Bazin <gbazin@videolan.org> 1096629097 +0000

Message:

* src/extras/libc.c: strtoll() replacement when not available.

Files:

• configure.ac (modified) (1 diff)
• include/vlc_common.h (modified) (1 diff)
• src/extras/libc.c (modified) (2 diffs)

configure.ac

@@ -298 +298 @@
-need_libc=false
-
-
+strtoll 
-
-dnl Check for usual libc functions

include/vlc_common.h

@@ -781 +781 @@
-#endif
-
+#ifndef HAVE_STRTOLL
+#   define strtoll vlc_strtoll
+    VLC_EXPORT( int64_t, vlc_strtoll, ( const char *nptr, char **endptr, int base ) );
+#elif !defined(__PLUGIN__)
+#   define vlc_strtoll NULL
+#endif
+
-#ifndef HAVE_GETENV
-#   define getenv vlc_getenv

src/extras/libc.c

@@ -24 +24 @@
-#include <string.h>                                              /* strdup() */
-#include <stdlib.h>
+#include <ctype.h>
-
-#include <vlc/vlc.h>
@@ -251 +252 @@
-
-/*****************************************************************************
+ * strtoll: convert a string to a 64 bits int.
+ *****************************************************************************/
+#if !defined( HAVE_STRTOLL )
+int64_t vlc_strtoll( const char *nptr, char **endptr, int base )
+{
+    int64_t i_value = 0;
+    int sign = 1, newbase = base ? base : 10;
+
+    while( isspace(*nptr) ) nptr++;
+
+    if( *nptr == '-' )
+    {
+        sign = -1;
+        nptr++;
+    }
+
+    /* Try to detect base */
+    if( *nptr == '0' )
+    {
+        newbase = 8;
+        nptr++;
+
+        if( *nptr == 'x' )
+        {
+            newbase = 16;
+            nptr++;
+        }
+    }
+
+    if( base && newbase != base )
+    {
+        if( endptr ) *endptr = (char *)nptr;
+        return i_value;
+    }
+
+    switch( newbase )
+    {
+        case 10:
+            while( *nptr >= '0' && *nptr <= '9' )
+            {
+                i_value *= 10;
+                i_value += ( *nptr++ - '0' );
+            }
+            if( endptr ) *endptr = (char *)nptr;
+            break;
+
+        case 16:
+            while( (*nptr >= '0' && *nptr <= '9') ||
+                   (*nptr >= 'a' && *nptr <= 'f') ||
+                   (*nptr >= 'A' && *nptr <= 'F') )
+            {
+                int i_valc = 0;
+                if(*nptr >= '0' && *nptr <= '9') i_valc = *nptr - '0';
+                else if(*nptr >= 'a' && *nptr <= 'f') i_valc = *nptr - 'a' +10;
+                else if(*nptr >= 'A' && *nptr <= 'F') i_valc = *nptr - 'A' +10;
+                i_value *= 16;
+                i_value += i_valc;
+                nptr++;
+            }
+            if( endptr ) *endptr = (char *)nptr;
+            break;
+
+        default:
+            i_value = strtol( nptr, endptr, newbase );
+            break;
+    }
+
+    return i_value * sign;
+}
+#endif
+
+/*****************************************************************************
- * atoll: convert a string to a 64 bits int.
- *****************************************************************************/
-#if !defined( HAVE_ATOLL )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-}
-#endif