X-Git-Url: https://pd.if.org/git/?p=pdclib;a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtoll.c;h=de7119429885cde06c589e24849e396f0915d36f;hp=8222d3442f39162ed928ffdc8c6bff8d12b34c9c;hb=da0f3f353d417fed71f358a48d5d5394145e460d;hpb=0c316ee3b4dc0712797877f5dc0f4a789646154d

diff --git a/functions/stdlib/strtoll.c b/functions/stdlib/strtoll.c
index 8222d34..de71194 100644
--- a/functions/stdlib/strtoll.c
+++ b/functions/stdlib/strtoll.c
@@ -1,5 +1,3 @@
-/* $Id$ */
-
 /* strtoll( const char *, char * *, int )
 
    This file is part of the Public Domain C Library (PDCLib).
@@ -25,8 +23,6 @@ long long int strtoll( const char * s, char ** endptr, int base )
     }
     else
     {
-        /* FIXME: This breaks on some machines that round negatives wrongly */
-        /* FIXME: Sign error not caught by testdriver */
         rc = (long long int)_PDCLIB_strtox_main( &p, (unsigned)base, (uintmax_t)LLONG_MIN, (uintmax_t)( LLONG_MIN / -base ), (int)( -( LLONG_MIN % base ) ), &sign );
     }
     if ( endptr != NULL ) *endptr = ( p != NULL ) ? (char *) p : (char *) s;
@@ -36,7 +32,7 @@ long long int strtoll( const char * s, char ** endptr, int base )
 #endif
 
 #ifdef TEST
-#include <_PDCLIB_test.h>
+#include "_PDCLIB_test.h"
 
 #include <errno.h>
 
@@ -85,36 +81,36 @@ int main( void )
     endptr = NULL;
     TESTCASE( strtoll( overflow, &endptr, 0 ) == 0 );
     TESTCASE( endptr == overflow );
-    /* These tests assume two-complement, but conversion should work for   */
-    /* one-complement and signed magnitude just as well. Anyone having a   */
-    /* platform to test this on?                                           */
+    /* TODO: These tests assume two-complement, but conversion should work */
+    /* for one-complement and signed magnitude just as well. Anyone having */
+    /* a platform to test this on?                                         */
     errno = 0;
-#if LLONG_MAX == 0x7fffffffffffffffLL
+#if LLONG_MAX >> 62 == 1
     /* testing "even" overflow, i.e. base is power of two */
-    TESTCASE( strtoll( "0x7FFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffff );
+    TESTCASE( strtoll( "9223372036854775807", NULL, 0 ) == 0x7fffffffffffffff );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "0x8000000000000000", NULL, 0 ) == LLONG_MAX );
+    TESTCASE( strtoll( "9223372036854775808", NULL, 0 ) == LLONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtoll( "-0x7FFFFFFFFFFFFFFF", NULL, 0 ) == (long long)0x8000000000000001 );
+    TESTCASE( strtoll( "-9223372036854775807", NULL, 0 ) == (long long)0x8000000000000001 );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x8000000000000000", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-9223372036854775808", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x8000000000000001", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-9223372036854775809", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
-#elif LLONG_MAX == 0x7fffffffffffffffffffffffffffffffLL
+#elif LLONG_MAX >> 126 == 1
     /* testing "even" overflow, i.e. base is power of two */
-    TESTCASE( strtoll( "0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffffffffffffffffffff );
+    TESTCASE( strtoll( "170141183460469231731687303715884105728", NULL, 0 ) == 0x7fffffffffffffffffffffffffffffff );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "0x80000000000000000000000000000000", NULL, 0 ) == LLONG_MAX );
+    TESTCASE( strtoll( "170141183460469231731687303715884105729", NULL, 0 ) == LLONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtoll( "-0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF", NULL, 0 ) == -0x80000000000000000000000000000001 );
+    TESTCASE( strtoll( "-170141183460469231731687303715884105728", NULL, 0 ) == -0x80000000000000000000000000000001 );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x80000000000000000000000000000000", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-170141183460469231731687303715884105729", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == 0 );
-    TESTCASE( strtoll( "-0x80000000000000000000000000000001", NULL, 0 ) == LLONG_MIN );
+    TESTCASE( strtoll( "-170141183460469231731687303715884105730", NULL, 0 ) == LLONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
 #else