PATCH: ntdll tests fixed

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

More compiler warnings fixed by adding of LL and ULL to LONGLONG and ULONGLONG
constants.

Ciao, Marcus

Changelog:
	Specify proper suffixes for integers longer than ints.

Index: dlls/ntdll/tests/large_int.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tests/large_int.c,v
retrieving revision 1.1
diff -u -r1.1 large_int.c
--- dlls/ntdll/tests/large_int.c	19 Feb 2003 03:40:14 -0000	1.1
+++ dlls/ntdll/tests/large_int.c	19 Jul 2003 14:17:36 -0000
@@ -60,48 +60,48 @@
 } magic_divide_t;
 
 static const magic_divide_t magic_divide[] = {
-    {                  3,   0x5555555555555555U, 0,                   0}, /* 1 */
-    {          333333333,   0x5555555555555555U, 0,           111111110}, /* 111111111 */
-    { 0x7fffffffffffffff,   0x5555555555555555U, 0,  0x2aaaaaaaaaaaaaaa},
-    {                  3,   0xaaaaaaaaaaaaaaaaU, 1,                   0}, /* 1 */
-    {          333333333,   0xaaaaaaaaaaaaaaaaU, 1,           111111110}, /* 111111111 */
-    { 0x7fffffffffffffff,   0xaaaaaaaaaaaaaaaaU, 1,  0x2aaaaaaaaaaaaaaa},
-    {                 -3,   0x5555555555555555U, 0,                   0}, /* -1 */
-    {         -333333333,   0x5555555555555555U, 0,          -111111110}, /* -111111111 */
-    {-0x7fffffffffffffff,   0x5555555555555555U, 0, -0x2aaaaaaaaaaaaaaa},
-    {                 -3,   0xaaaaaaaaaaaaaaaaU, 1,                   0}, /* -1 */
-    {         -333333333,   0xaaaaaaaaaaaaaaaaU, 1,          -111111110}, /* -111111111 */
-    {-0x7fffffffffffffff,   0xaaaaaaaaaaaaaaaaU, 1, -0x2aaaaaaaaaaaaaaa},
-    {                 -3,  -0x5555555555555555U, 0,                  -2}, /* -1 */
-    {         -333333333,  -0x5555555555555555U, 0,          -222222222}, /* -111111111 */
-    {-0x7fffffffffffffff,  -0x5555555555555555U, 0, -0x5555555555555554},
-    {                 -3,  -0xaaaaaaaaaaaaaaaaU, 1,                   0}, /* -1 */
-    {         -333333333,  -0xaaaaaaaaaaaaaaaaU, 1,           -55555555}, /* -111111111 */
-    {-0x7fffffffffffffff,  -0xaaaaaaaaaaaaaaaaU, 1, -0x1555555555555555},
-    {                  3,  -0x5555555555555555U, 0,                   2}, /* -1 */
-    {          333333333,  -0x5555555555555555U, 0,           222222222}, /* -111111111 */
-    { 0x7fffffffffffffff,  -0x5555555555555555U, 0,  0x5555555555555554},
-    {                  3,  -0xaaaaaaaaaaaaaaaaU, 1,                   0}, /* -1 */
-    {          333333333,  -0xaaaaaaaaaaaaaaaaU, 1,            55555555}, /* -111111111 */
-    { 0x7fffffffffffffff,  -0xaaaaaaaaaaaaaaaaU, 1,  0x1555555555555555},
-    {                  3, 12297829382473033728U, 1,                   0}, /* 1 */
-    {          333333333, 12297829382473033728U, 1,           111111110}, /* 111111111 */
-    { 0x7fffffffffffffff, 12297829382473033728U, 1,  0x2aaaaaaaaaaaa9ff}, /* 0x2aaaaaaaaaaaaaaa */
-    {                  5,  3689348814741910527U, 0,                   1},
-    {          555555555,  3689348814741910527U, 0,           111111111},
-    { 0x7fffffffffffffff,  3689348814741910527U, 0,  0x19999999999999ff}, /* 0x199999999999999a */
-    {                  5,  7378697629483821054U, 1,                   1},
-    {          555555555,  7378697629483821054U, 1,           111111111},
-    { 0x7fffffffffffffff,  7378697629483821054U, 1,  0x19999999999999ff}, /* 0x199999999999999a */
-    {                  5, 14757395258967642109U, 2,                   1},
-    {          555555555, 14757395258967642109U, 2,           111111111},
-    { 0x7fffffffffffffff, 14757395258967642109U, 2,  0x19999999999999ff}, /* 0x199999999999999a */
-    {      0xaddcafeface,     0x2f1e28fd1b5ccaU, 33,                  1},
-    {  0x81ac1b9c2310a80,     0x2f1e28fd1b5ccaU, 33,             0xbeef},
-    { 0x74ae3b5f1558c800,     0x2f1e28fd1b5ccaU, 33,            0xabcde},
-    {      0xaddcafeface,   0x2f1e28fd1b5cca00U, 41,                  1},
-    {  0x81ac1b9c2310a80,   0x2f1e28fd1b5cca00U, 41,             0xbeef},
-    { 0x74ae3b5f1558c800,   0x2f1e28fd1b5cca00U, 41,            0xabcde},
+    {                  3LL,   0x5555555555555555LL, 0,                   0LL}, /* 1 */
+    {          333333333LL,   0x5555555555555555LL, 0,           111111110LL}, /* 111111111 */
+    { 0x7fffffffffffffffLL,   0x5555555555555555LL, 0,  0x2aaaaaaaaaaaaaaaLL},
+    {                  3LL,   0xaaaaaaaaaaaaaaaaLL, 1,                   0LL}, /* 1 */
+    {          333333333LL,   0xaaaaaaaaaaaaaaaaLL, 1,           111111110LL}, /* 111111111 */
+    { 0x7fffffffffffffffLL,   0xaaaaaaaaaaaaaaaaLL, 1,  0x2aaaaaaaaaaaaaaaLL},
+    {                 -3LL,   0x5555555555555555LL, 0,                   0LL}, /* -1 */
+    {         -333333333LL,   0x5555555555555555LL, 0,          -111111110LL}, /* -111111111 */
+    {-0x7fffffffffffffffLL,   0x5555555555555555LL, 0, -0x2aaaaaaaaaaaaaaaLL},
+    {                 -3LL,   0xaaaaaaaaaaaaaaaaLL, 1,                   0LL}, /* -1 */
+    {         -333333333LL,   0xaaaaaaaaaaaaaaaaLL, 1,          -111111110LL}, /* -111111111 */
+    {-0x7fffffffffffffffLL,   0xaaaaaaaaaaaaaaaaLL, 1, -0x2aaaaaaaaaaaaaaaLL},
+    {                 -3LL,  -0x5555555555555555LL, 0,                  -2LL}, /* -1 */
+    {         -333333333LL,  -0x5555555555555555LL, 0,          -222222222LL}, /* -111111111 */
+    {-0x7fffffffffffffffLL,  -0x5555555555555555LL, 0, -0x5555555555555554LL},
+    {                 -3LL,  -0xaaaaaaaaaaaaaaaaLL, 1,                   0LL}, /* -1 */
+    {         -333333333LL,  -0xaaaaaaaaaaaaaaaaLL, 1,           -55555555LL}, /* -111111111 */
+    {-0x7fffffffffffffffLL,  -0xaaaaaaaaaaaaaaaaLL, 1, -0x1555555555555555LL},
+    {                  3LL,  -0x5555555555555555LL, 0,                   2LL}, /* -1 */
+    {          333333333LL,  -0x5555555555555555LL, 0,           222222222LL}, /* -111111111 */
+    { 0x7fffffffffffffffLL,  -0x5555555555555555LL, 0,  0x5555555555555554LL},
+    {                  3LL,  -0xaaaaaaaaaaaaaaaaLL, 1,                   0LL}, /* -1 */
+    {          333333333LL,  -0xaaaaaaaaaaaaaaaaLL, 1,            55555555LL}, /* -111111111 */
+    { 0x7fffffffffffffffLL,  -0xaaaaaaaaaaaaaaaaLL, 1,  0x1555555555555555LL},
+    {                  3LL, 12297829382473033728ULL, 1,                   0LL}, /* 1 */
+    {          333333333LL, 12297829382473033728ULL, 1,           111111110LL}, /* 111111111 */
+    { 0x7fffffffffffffffLL, 12297829382473033728ULL, 1,  0x2aaaaaaaaaaaa9ffLL}, /* 0x2aaaaaaaaaaaaaaa */
+    {                  5LL,  3689348814741910527LL, 0,                   1LL},
+    {          555555555LL,  3689348814741910527LL, 0,           111111111LL},
+    { 0x7fffffffffffffffLL,  3689348814741910527LL, 0,  0x19999999999999ffLL}, /* 0x199999999999999a */
+    {                  5LL,  7378697629483821054LL, 1,                   1LL},
+    {          555555555LL,  7378697629483821054LL, 1,           111111111LL},
+    { 0x7fffffffffffffffLL,  7378697629483821054LL, 1,  0x19999999999999ffLL}, /* 0x199999999999999a */
+    {                  5LL, 14757395258967642109ULL, 2,                   1LL},
+    {          555555555LL, 14757395258967642109ULL, 2,           111111111LL},
+    { 0x7fffffffffffffffLL, 14757395258967642109ULL, 2,  0x19999999999999ffLL}, /* 0x199999999999999a */
+    {      0xaddcafefaceLL,     0x2f1e28fd1b5ccaLL, 33,                  1LL},
+    {  0x81ac1b9c2310a80LL,     0x2f1e28fd1b5ccaLL, 33,             0xbeefLL},
+    { 0x74ae3b5f1558c800LL,     0x2f1e28fd1b5ccaLL, 33,            0xabcdeLL},
+    {      0xaddcafefaceLL,   0x2f1e28fd1b5cca00LL, 41,                  1LL},
+    {  0x81ac1b9c2310a80LL,   0x2f1e28fd1b5cca00LL, 41,             0xbeefLL},
+    { 0x74ae3b5f1558c800LL,   0x2f1e28fd1b5cca00LL, 41,            0xabcdeLL},
 
 };
 #define NB_MAGIC_DIVIDE (sizeof(magic_divide)/sizeof(*magic_divide))
@@ -161,17 +161,17 @@
     { 0,  2147483649U, 10, 11, "2147483649\0--------------------------------------------------------", STATUS_SUCCESS},
     { 0,  4294967294U, 10, 11, "4294967294\0--------------------------------------------------------", STATUS_SUCCESS},
     { 0,  4294967295U, 10, 11, "4294967295\0--------------------------------------------------------", STATUS_SUCCESS},
-    { 0,       12345678901U, 11, 12, "12345678901\0-------------------------------------------------------", STATUS_SUCCESS},
-    { 0,      987654321012U, 12, 13, "987654321012\0------------------------------------------------------", STATUS_SUCCESS},
-    { 0,     1928374656574U, 13, 14, "1928374656574\0-----------------------------------------------------", STATUS_SUCCESS},
-    { 0,      0xBADCAFEFACE, 14, 15, "12841062955726\0----------------------------------------------------", STATUS_SUCCESS},
-    { 0,     0x5BADCAFEFACE, 15, 16, "100801993177806\0---------------------------------------------------", STATUS_SUCCESS},
-    { 0,    0xAFACEBEEFCAFE, 16, 20, "3090515640699646\0--------------------------------------------------", STATUS_SUCCESS},
-    { 0,   0xA5BEEFABCDCAFE, 17, 20, "46653307746110206\0-------------------------------------------------", STATUS_SUCCESS},
-    { 0,  0x1F8CF9BF2DF3AF1, 18, 20, "142091656963767025\0------------------------------------------------", STATUS_SUCCESS},
-    { 0,  0xFFFFFFFFFFFFFFF, 19, 20, "1152921504606846975\0-----------------------------------------------", STATUS_SUCCESS},
-    { 0, 0xFFFFFFFFFFFFFFFE, 20, 21, "18446744073709551614\0----------------------------------------------", STATUS_SUCCESS},
-    { 0, 0xFFFFFFFFFFFFFFFF, 20, 21, "18446744073709551615\0----------------------------------------------", STATUS_SUCCESS},
+    { 0,       12345678901ULL, 11, 12, "12345678901\0-------------------------------------------------------", STATUS_SUCCESS},
+    { 0,      987654321012ULL, 12, 13, "987654321012\0------------------------------------------------------", STATUS_SUCCESS},
+    { 0,     1928374656574ULL, 13, 14, "1928374656574\0-----------------------------------------------------", STATUS_SUCCESS},
+    { 0,      0xBADCAFEFACEULL, 14, 15, "12841062955726\0----------------------------------------------------", STATUS_SUCCESS},
+    { 0,     0x5BADCAFEFACEULL, 15, 16, "100801993177806\0---------------------------------------------------", STATUS_SUCCESS},
+    { 0,    0xAFACEBEEFCAFEULL, 16, 20, "3090515640699646\0--------------------------------------------------", STATUS_SUCCESS},
+    { 0,   0xA5BEEFABCDCAFEULL, 17, 20, "46653307746110206\0-------------------------------------------------", STATUS_SUCCESS},
+    { 0,  0x1F8CF9BF2DF3AF1ULL, 18, 20, "142091656963767025\0------------------------------------------------", STATUS_SUCCESS},
+    { 0,  0xFFFFFFFFFFFFFFFULL, 19, 20, "1152921504606846975\0-----------------------------------------------", STATUS_SUCCESS},
+    { 0, 0xFFFFFFFFFFFFFFFEULL, 20, 21, "18446744073709551614\0----------------------------------------------", STATUS_SUCCESS},
+    { 0, 0xFFFFFFFFFFFFFFFFULL, 20, 21, "18446744073709551615\0----------------------------------------------", STATUS_SUCCESS},
 
     { 2,  0x80000000U, 32, 33, "10000000000000000000000000000000\0----------------------------------", STATUS_SUCCESS},
 /*
Index: dlls/ntdll/tests/rtl.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tests/rtl.c,v
retrieving revision 1.3
diff -u -r1.3 rtl.c
--- dlls/ntdll/tests/rtl.c	18 Jul 2003 22:55:15 -0000	1.3
+++ dlls/ntdll/tests/rtl.c	19 Jul 2003 14:17:38 -0000
@@ -235,8 +235,8 @@
 {
     ULONGLONG result;
 
-    result = pRtlUlonglongByteSwap(0x7654321087654321);
-    ok(0x2143658710325476 == result,
+    result = pRtlUlonglongByteSwap(0x7654321087654321LL);
+    ok(0x2143658710325476LL == result,
        "RtlUlonglongByteSwap(0x7654321087654321) returns 0x%llx, expected 0x2143658710325476",
        result);
 }
Index: dlls/ntdll/tests/string.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/tests/string.c,v
retrieving revision 1.1
diff -u -r1.1 string.c
--- dlls/ntdll/tests/string.c	18 Mar 2003 18:27:19 -0000	1.1
+++ dlls/ntdll/tests/string.c	19 Jul 2003 14:17:48 -0000
@@ -479,16 +479,16 @@
     { 2,  2147483649U, "10000000000000000000000000000001\0----------------------------------", 0x33},
     { 2,  4294967294U, "11111111111111111111111111111110\0----------------------------------", 0x33},
     { 2,   0xFFFFFFFF, "11111111111111111111111111111111\0----------------------------------", 0x33},
-    { 2,  0x1FFFFFFFF, "111111111111111111111111111111111\0---------------------------------", 0x33},
-    { 2,  10000000000, "1001010100000010111110010000000000\0--------------------------------", 0x33},
-    { 2,  0x3FFFFFFFF, "1111111111111111111111111111111111\0--------------------------------", 0x33},
-    { 2,  0x7FFFFFFFF, "11111111111111111111111111111111111\0-------------------------------", 0x33},
-    { 2,  0xFFFFFFFFF, "111111111111111111111111111111111111\0------------------------------", 0x33},
-    { 2, 100000000000, "1011101001000011101101110100000000000\0-----------------------------", 0x33},
-    { 2, 0x1FFFFFFFFF, "1111111111111111111111111111111111111\0-----------------------------", 0x33},
-    { 2, 0x3FFFFFFFFF, "11111111111111111111111111111111111111\0----------------------------", 0x33},
-    { 2, 0x7FFFFFFFFF, "111111111111111111111111111111111111111\0---------------------------", 0x33},
-    { 2, 0xFFFFFFFFFF, "1111111111111111111111111111111111111111\0--------------------------", 0x33},
+    { 2,  0x1FFFFFFFFLL, "111111111111111111111111111111111\0---------------------------------", 0x33},
+    { 2,  10000000000LL, "1001010100000010111110010000000000\0--------------------------------", 0x33},
+    { 2,  0x3FFFFFFFFLL, "1111111111111111111111111111111111\0--------------------------------", 0x33},
+    { 2,  0x7FFFFFFFFLL, "11111111111111111111111111111111111\0-------------------------------", 0x33},
+    { 2,  0xFFFFFFFFFLL, "111111111111111111111111111111111111\0------------------------------", 0x33},
+    { 2, 100000000000LL, "1011101001000011101101110100000000000\0-----------------------------", 0x33},
+    { 2, 0x1FFFFFFFFFLL, "1111111111111111111111111111111111111\0-----------------------------", 0x33},
+    { 2, 0x3FFFFFFFFFLL, "11111111111111111111111111111111111111\0----------------------------", 0x33},
+    { 2, 0x7FFFFFFFFFLL, "111111111111111111111111111111111111111\0---------------------------", 0x33},
+    { 2, 0xFFFFFFFFFFLL, "1111111111111111111111111111111111111111\0--------------------------", 0x33},
 
     { 8,  0x80000000U, "20000000000\0-------------------------------------------------------", 0x33},
     { 8,  -2147483647, "1777777777760000000001\0--------------------------------------------", 0x33},
@@ -529,57 +529,57 @@
     {10,  2147483649U, "2147483649\0--------------------------------------------------------", 0x33},
     {10,  4294967294U, "4294967294\0--------------------------------------------------------", 0x33},
     {10,  4294967295U, "4294967295\0--------------------------------------------------------", 0x33},
-    {10,       12345678901U, "12345678901\0-------------------------------------------------------", 0x33},
-    {10,      987654321012U, "987654321012\0------------------------------------------------------", 0x33},
-    {10,     1928374656574U, "1928374656574\0-----------------------------------------------------", 0x33},
-    {10,      0xBADCAFEFACE, "12841062955726\0----------------------------------------------------", 0x33},
-    {10,     0x5BADCAFEFACE, "100801993177806\0---------------------------------------------------", 0x33},
-    {10,    0xAFACEBEEFCAFE, "3090515640699646\0--------------------------------------------------", 0x33},
-    {10,   0xA5BEEFABCDCAFE, "46653307746110206\0-------------------------------------------------", 0x33},
-    {10,  0x1F8CF9BF2DF3AF1, "142091656963767025\0------------------------------------------------", 0x33},
-    {10,  0xFFFFFFFFFFFFFFF, "1152921504606846975\0-----------------------------------------------", 0x33},
-    {10, 0x7FFFFFFFFFFFFFFF, "9223372036854775807\0-----------------------------------------------", 0x33},
-    {10, 0x8000000000000000, "-9223372036854775808\0----------------------------------------------", 0x11},
-    {10, 0x8000000000000000, "9223372036854775808\0-----------------------------------------------", 0x22},
-    {10, 0x8000000000000001, "-9223372036854775807\0----------------------------------------------", 0x55},
-    {10, 0x8000000000000001, "-9223372036854775809\0----------------------------------------------", 0x00},
-    {10, 0x8000000000000001, "9223372036854775809\0-----------------------------------------------", 0x22},
-    {10, 0x8000000000000002, "-9223372036854775806\0----------------------------------------------", 0x55},
-    {10, 0x8000000000000002, "-9223372036854775810\0----------------------------------------------", 0x00},
-    {10, 0x8000000000000002, "9223372036854775810\0-----------------------------------------------", 0x22},
-    {10, 0xFFFFFFFFFFFFFFFE, "-2\0----------------------------------------------------------------", 0x55},
-    {10, 0xFFFFFFFFFFFFFFFE, "-18446744073709551614\0---------------------------------------------", 0x00},
-    {10, 0xFFFFFFFFFFFFFFFE, "18446744073709551614\0----------------------------------------------", 0x22},
-    {10, 0xFFFFFFFFFFFFFFFF, "-1\0----------------------------------------------------------------", 0x55},
-    {10, 0xFFFFFFFFFFFFFFFF, "-18446744073709551615\0---------------------------------------------", 0x00},
-    {10, 0xFFFFFFFFFFFFFFFF, "18446744073709551615\0----------------------------------------------", 0x22},
-
-    {16,                  0, "0\0-----------------------------------------------------------------", 0x33},
-    {16,                  1, "1\0-----------------------------------------------------------------", 0x33},
-    {16,         2147483646, "7ffffffe\0----------------------------------------------------------", 0x33},
-    {16,         2147483647, "7fffffff\0----------------------------------------------------------", 0x33},
-    {16,         0x80000000, "80000000\0----------------------------------------------------------", 0x33},
-    {16,         0x80000001, "80000001\0----------------------------------------------------------", 0x33},
-    {16,         0xFFFFFFFE, "fffffffe\0----------------------------------------------------------", 0x33},
-    {16,         0xFFFFFFFF, "ffffffff\0----------------------------------------------------------", 0x33},
-    {16,        0x100000000, "100000000\0---------------------------------------------------------", 0x33},
-    {16,      0xBADDEADBEEF, "baddeadbeef\0-------------------------------------------------------", 0x33},
-    {16, 0x8000000000000000, "8000000000000000\0--------------------------------------------------", 0x33},
-    {16, 0xFEDCBA9876543210, "fedcba9876543210\0--------------------------------------------------", 0x33},
-    {16, 0xFFFFFFFF80000001, "ffffffff80000001\0--------------------------------------------------", 0x33},
-    {16, 0xFFFFFFFFFFFFFFFE, "fffffffffffffffe\0--------------------------------------------------", 0x33},
-    {16, 0xFFFFFFFFFFFFFFFF, "ffffffffffffffff\0--------------------------------------------------", 0x33},
-
-    { 2,        32768, "1000000000000000\0--------------------------------------------------", 0x33},
-    { 2,        65536, "10000000000000000\0-------------------------------------------------", 0x33},
-    { 2,       131072, "100000000000000000\0------------------------------------------------", 0x33},
-    {16,   0xffffffff, "ffffffff\0----------------------------------------------------------", 0x33},
-    {16,          0xa, "a\0-----------------------------------------------------------------", 0x33},
-    {16,            0, "0\0-----------------------------------------------------------------", 0x33},
-    {20,      3368421, "111111\0------------------------------------------------------------", 0x33},
-    {36,     62193781, "111111\0------------------------------------------------------------", 0x33},
-    {37,     71270178, "111111\0------------------------------------------------------------", 0x33},
-    {99,   9606940300, "111111\0------------------------------------------------------------", 0x33},
+    {10,       12345678901ULL, "12345678901\0-------------------------------------------------------", 0x33},
+    {10,      987654321012ULL, "987654321012\0------------------------------------------------------", 0x33},
+    {10,     1928374656574ULL, "1928374656574\0-----------------------------------------------------", 0x33},
+    {10,      0xBADCAFEFACELL, "12841062955726\0----------------------------------------------------", 0x33},
+    {10,     0x5BADCAFEFACELL, "100801993177806\0---------------------------------------------------", 0x33},
+    {10,    0xAFACEBEEFCAFELL, "3090515640699646\0--------------------------------------------------", 0x33},
+    {10,   0xA5BEEFABCDCAFELL, "46653307746110206\0-------------------------------------------------", 0x33},
+    {10,  0x1F8CF9BF2DF3AF1LL, "142091656963767025\0------------------------------------------------", 0x33},
+    {10,  0xFFFFFFFFFFFFFFFLL, "1152921504606846975\0-----------------------------------------------", 0x33},
+    {10, 0x7FFFFFFFFFFFFFFFLL, "9223372036854775807\0-----------------------------------------------", 0x33},
+    {10, 0x8000000000000000LL, "-9223372036854775808\0----------------------------------------------", 0x11},
+    {10, 0x8000000000000000LL, "9223372036854775808\0-----------------------------------------------", 0x22},
+    {10, 0x8000000000000001LL, "-9223372036854775807\0----------------------------------------------", 0x55},
+    {10, 0x8000000000000001LL, "-9223372036854775809\0----------------------------------------------", 0x00},
+    {10, 0x8000000000000001LL, "9223372036854775809\0-----------------------------------------------", 0x22},
+    {10, 0x8000000000000002LL, "-9223372036854775806\0----------------------------------------------", 0x55},
+    {10, 0x8000000000000002LL, "-9223372036854775810\0----------------------------------------------", 0x00},
+    {10, 0x8000000000000002LL, "9223372036854775810\0-----------------------------------------------", 0x22},
+    {10, 0xFFFFFFFFFFFFFFFEULL, "-2\0----------------------------------------------------------------", 0x55},
+    {10, 0xFFFFFFFFFFFFFFFEULL, "-18446744073709551614\0---------------------------------------------", 0x00},
+    {10, 0xFFFFFFFFFFFFFFFEULL, "18446744073709551614\0----------------------------------------------", 0x22},
+    {10, 0xFFFFFFFFFFFFFFFFULL, "-1\0----------------------------------------------------------------", 0x55},
+    {10, 0xFFFFFFFFFFFFFFFFULL, "-18446744073709551615\0---------------------------------------------", 0x00},
+    {10, 0xFFFFFFFFFFFFFFFFULL, "18446744073709551615\0----------------------------------------------", 0x22},
+
+    {16,                  0ULL, "0\0-----------------------------------------------------------------", 0x33},
+    {16,                  1ULL, "1\0-----------------------------------------------------------------", 0x33},
+    {16,         2147483646ULL, "7ffffffe\0----------------------------------------------------------", 0x33},
+    {16,         2147483647ULL, "7fffffff\0----------------------------------------------------------", 0x33},
+    {16,         0x80000000ULL, "80000000\0----------------------------------------------------------", 0x33},
+    {16,         0x80000001ULL, "80000001\0----------------------------------------------------------", 0x33},
+    {16,         0xFFFFFFFEULL, "fffffffe\0----------------------------------------------------------", 0x33},
+    {16,         0xFFFFFFFFULL, "ffffffff\0----------------------------------------------------------", 0x33},
+    {16,        0x100000000ULL, "100000000\0---------------------------------------------------------", 0x33},
+    {16,      0xBADDEADBEEFULL, "baddeadbeef\0-------------------------------------------------------", 0x33},
+    {16, 0x8000000000000000ULL, "8000000000000000\0--------------------------------------------------", 0x33},
+    {16, 0xFEDCBA9876543210ULL, "fedcba9876543210\0--------------------------------------------------", 0x33},
+    {16, 0xFFFFFFFF80000001ULL, "ffffffff80000001\0--------------------------------------------------", 0x33},
+    {16, 0xFFFFFFFFFFFFFFFEULL, "fffffffffffffffe\0--------------------------------------------------", 0x33},
+    {16, 0xFFFFFFFFFFFFFFFFULL, "ffffffffffffffff\0--------------------------------------------------", 0x33},
+
+    { 2,        32768ULL, "1000000000000000\0--------------------------------------------------", 0x33},
+    { 2,        65536ULL, "10000000000000000\0-------------------------------------------------", 0x33},
+    { 2,       131072ULL, "100000000000000000\0------------------------------------------------", 0x33},
+    {16,   0xffffffffULL, "ffffffff\0----------------------------------------------------------", 0x33},
+    {16,          0xaULL, "a\0-----------------------------------------------------------------", 0x33},
+    {16,            0ULL, "0\0-----------------------------------------------------------------", 0x33},
+    {20,      3368421ULL, "111111\0------------------------------------------------------------", 0x33},
+    {36,     62193781ULL, "111111\0------------------------------------------------------------", 0x33},
+    {37,     71270178ULL, "111111\0------------------------------------------------------------", 0x33},
+    {99,   9606940300ULL, "111111\0------------------------------------------------------------", 0x33},
 };
 #define NB_ULONGLONG2STR (sizeof(ulonglong2str)/sizeof(*ulonglong2str))
 
@@ -969,34 +969,34 @@
     { "00x12345",              0   },
     { "0xx12345",              0   },
     { "1x34",                  1   },
-    { "-99999999999999999999",  -7766279631452241919   }, /* Big negative integer */
-    { "-9223372036854775809",    9223372036854775807   }, /* Too small to fit in 64 bits */
-    { "-9223372036854775808",     0x8000000000000000   }, /* Smallest negativ 64 bit integer */
-    { "-9223372036854775807",   -9223372036854775807   },
-    { "-9999999999",                     -9999999999   },
+    { "-99999999999999999999",  -7766279631452241919LL }, /* Big negative integer */
+    { "-9223372036854775809",    9223372036854775807LL }, /* Too small to fit in 64 bits */
+    { "-9223372036854775808",     0x8000000000000000LL }, /* Smallest negativ 64 bit integer */
+    { "-9223372036854775807",   -9223372036854775807LL },
+    { "-9999999999",                     -9999999999LL },
     { "-2147483649",                     -2147483649LL }, /* Too small to fit in 32 bits */
     { "-2147483648",                     -2147483648LL }, /* Smallest 32 bits negative integer */
-    { "-2147483647",                     -2147483647   },
-    { "-1",                                       -1   },
-    { "0",                                         0   },
-    { "1",                                         1   },
-    { "2147483646",                       2147483646   },
-    { "2147483647",                       2147483647   }, /* Largest signed positive 32 bit integer */
+    { "-2147483647",                     -2147483647LL },
+    { "-1",                                       -1LL },
+    { "0",                                         0LL },
+    { "1",                                         1LL },
+    { "2147483646",                       2147483646LL },
+    { "2147483647",                       2147483647LL }, /* Largest signed positive 32 bit integer */
     { "2147483648",                       2147483648LL }, /* Pos int equal to smallest neg 32 bit int */
     { "2147483649",                       2147483649LL },
     { "4294967294",                       4294967294LL },
     { "4294967295",                       4294967295LL }, /* Largest unsigned 32 bit integer */
-    { "4294967296",                       4294967296   }, /* Too big to fit in 32 Bits */
-    { "9999999999",                       9999999999   },
-    { "9223372036854775806",     9223372036854775806   }, 
-    { "9223372036854775807",     9223372036854775807   }, /* Largest signed positive 64 bit integer */
-    { "9223372036854775808",     9223372036854775808ULL}, /* Pos int equal to smallest neg 64 bit int */
-    { "9223372036854775809",     9223372036854775809ULL},
-    { "18446744073709551614",   18446744073709551614ULL},
-    { "18446744073709551615",   18446744073709551615ULL}, /* Largest unsigned 64 bit integer */
-    { "18446744073709551616",                      0   }, /* Too big to fit in 64 bits */
-    { "99999999999999999999",    7766279631452241919   }, /* Big positive integer */
-    { "056789",            56789   }, /* Leading zero and still decimal */
+    { "4294967296",                       4294967296LL }, /* Too big to fit in 32 Bits */
+    { "9999999999",                       9999999999LL },
+    { "9223372036854775806",     9223372036854775806LL }, 
+    { "9223372036854775807",     9223372036854775807LL }, /* Largest signed positive 64 bit integer */
+    { "9223372036854775808",     9223372036854775808ULL }, /* Pos int equal to smallest neg 64 bit int */
+    { "9223372036854775809",     9223372036854775809ULL },
+    { "18446744073709551614",   18446744073709551614ULL },
+    { "18446744073709551615",   18446744073709551615ULL }, /* Largest unsigned 64 bit integer */
+    { "18446744073709551616",                      0LL }, /* Too big to fit in 64 bits */
+    { "99999999999999999999",    7766279631452241919LL }, /* Big positive integer */
+    { "056789",            56789LL }, /* Leading zero and still decimal */
     { "b1011101100",           0   }, /* Binary (b-notation) */
     { "-b1011101100",          0   }, /* Negative Binary (b-notation) */
     { "b10123456789",          0   }, /* Binary with nonbinary digits (2-9) */


[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux