Merged branch stdio_rewrite back into trunk.

[pdclib] / functions / stdlib / strtol.c

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index 7ff35b3243c28617411fb1df2b80c2b454c82f63..8fc95b0fce7c66d842bcb8d325e371f211f2cac9 100644 (file)
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -1,7 +1,5 @@
 /* $Id$ */
 
-/* Release $Name$ */
-
 /* strtol( const char *, char * *, int )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -23,12 +21,12 @@ long int strtol( const char * s, char ** endptr, int base )
     if ( base < 2 || base > 36 ) return 0;
     if ( sign == '+' )
     {
-        rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MAX, (uintmax_t)( LONG_MAX / base ), (uintmax_t)( LONG_MAX % base ), &sign );
+        rc = (long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MAX, (uintmax_t)( LONG_MAX / base ), (int)( LONG_MAX % base ), &sign );
     }
     else
     {
         /* FIXME: This breaks on some machines that round negatives wrongly */
-        rc = _PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MIN, (uintmax_t)( LONG_MIN / -base ), (uintmax_t)( -( LONG_MIN % base ) ), &sign );
+        rc = (long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LONG_MIN, (uintmax_t)( LONG_MIN / -base ), (int)( -( LONG_MIN % base ) ), &sign );
     }
     if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) s;
     return ( sign == '+' ) ? rc : -rc;
@@ -94,7 +92,7 @@ int main( void )
     TESTCASE( strtol( "0x80000000", NULL, 0 ) == LONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtol( "-0x7FFFFFFF", NULL, 0 ) == 0x80000001 );
+    TESTCASE( strtol( "-0x7FFFFFFF", NULL, 0 ) == (long)0x80000001 );
     TESTCASE( errno == 0 );
     TESTCASE( strtol( "-0x80000000", NULL, 0 ) == LONG_MIN );
     TESTCASE( errno == 0 );
@@ -108,7 +106,7 @@ int main( void )
     TESTCASE( strtol( "0x8000000000000000", NULL, 0 ) == LONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtol( "-0x7FFFFFFFFFFFFFFF", NULL, 0 ) == -0x8000000000000001 );
+    TESTCASE( strtol( "-0x7FFFFFFFFFFFFFFF", NULL, 0 ) == (long)0x8000000000000001 );
     TESTCASE( errno == 0 );
     TESTCASE( strtol( "-0x8000000000000000", NULL, 0 ) == LONG_MIN );
     TESTCASE( errno == 0 );