X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=functions%2Fstdlib%2Fstrtol.c;h=dce035ea1f9bd8a254b36ce9cde74f4e18bbcb63;hb=3c7e677c7a6b43ce8bd12021e0af280f08009777;hp=05271e05054e8cc877b79eb94326c1a42a900987;hpb=0c316ee3b4dc0712797877f5dc0f4a789646154d;p=pdclib

diff --git a/functions/stdlib/strtol.c b/functions/stdlib/strtol.c
index 05271e0..dce035e 100644
--- a/functions/stdlib/strtol.c
+++ b/functions/stdlib/strtol.c
@@ -84,36 +84,42 @@ int main( void )
     endptr = NULL;
     TESTCASE( strtol( 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 LONG_MAX == 0x7fffffffL
+#if LONG_MAX >> 30 == 1
     /* testing "even" overflow, i.e. base is power of two */
-    TESTCASE( strtol( "0x7FFFFFFF", NULL, 0 ) == 0x7fffffff );
+    TESTCASE( strtol( "2147483647", NULL, 0 ) == 0x7fffffff );
     TESTCASE( errno == 0 );
-    TESTCASE( strtol( "0x80000000", NULL, 0 ) == LONG_MAX );
+    errno = 0;
+    TESTCASE( strtol( "2147483648", NULL, 0 ) == LONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtol( "-0x7FFFFFFF", NULL, 0 ) == (long)0x80000001 );
+    TESTCASE( strtol( "-2147483647", NULL, 0 ) == (long)0x80000001 );
     TESTCASE( errno == 0 );
-    TESTCASE( strtol( "-0x80000000", NULL, 0 ) == LONG_MIN );
+    errno = 0;
+    TESTCASE( strtol( "-2147483648", NULL, 0 ) == LONG_MIN );
     TESTCASE( errno == 0 );
-    TESTCASE( strtol( "-0x80000001", NULL, 0 ) == LONG_MIN );
+    errno = 0;
+    TESTCASE( strtol( "-2147483649", NULL, 0 ) == LONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
-#elif LONG_MAX == 0x7fffffffffffffffL
+#elif LONG_MAX >> 62 == 1
     /* testing "even" overflow, i.e. base is power of two */
-    TESTCASE( strtol( "0x7FFFFFFFFFFFFFFF", NULL, 0 ) == 0x7fffffffffffffff );
+    TESTCASE( strtol( "9223372036854775807", NULL, 0 ) == 0x7fffffffffffffff );
     TESTCASE( errno == 0 );
-    TESTCASE( strtol( "0x8000000000000000", NULL, 0 ) == LONG_MAX );
+    errno = 0;
+    TESTCASE( strtol( "9223372036854775808", NULL, 0 ) == LONG_MAX );
     TESTCASE( errno == ERANGE );
     errno = 0;
-    TESTCASE( strtol( "-0x7FFFFFFFFFFFFFFF", NULL, 0 ) == (long)0x8000000000000001 );
+    TESTCASE( strtol( "-9223372036854775807", NULL, 0 ) == (long)0x8000000000000001 );
     TESTCASE( errno == 0 );
-    TESTCASE( strtol( "-0x8000000000000000", NULL, 0 ) == LONG_MIN );
+    errno = 0;
+    TESTCASE( strtol( "-9223372036854775808", NULL, 0 ) == LONG_MIN );
     TESTCASE( errno == 0 );
-    TESTCASE( strtol( "-0x8000000000000001", NULL, 0 ) == LONG_MIN );
+    errno = 0;
+    TESTCASE( strtol( "-9223372036854775809", NULL, 0 ) == LONG_MIN );
     TESTCASE( errno == ERANGE );
     /* TODO: test "odd" overflow, i.e. base is not power of two */
 #else