romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 22:13:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

system.h: remove some macros

Browse source 
Since curl_off_t is always 64 bit these days, we can simplify and avoid
using some macros.

Closes #17498
This commit is contained in:
Daniel Stenberg 2025-05-31 18:47:23 +02:00
parent 68c02e6ab7
commit 614313f12f
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
14 changed files with 149 additions and 213 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/libtest/lib517.c
View file

@ -142,7 +142,7 @@ static const struct dcheck dates[] = {
{"Thu, 31-Dec-1969 23:59:58 GMT", -2 },
{"Thu, 31-Dec-1969 23:59:59 GMT", 0 }, /* avoids -1 ! */
#if SIZEOF_TIME_T > 4
{"Sun, 06 Nov 2044 08:49:37 GMT", (time_t) CURL_OFF_TU_C(2362034977) },
{"Sun, 06 Nov 2044 08:49:37 GMT", (time_t) 2362034977 },
{"Sun, 06 Nov 3144 08:49:37 GMT", 37074617377 },
#ifndef HAVE_TIME_T_UNSIGNED
#if 0

154
tests/libtest/lib557.c
View file

@ -46,22 +46,6 @@
#endif
#endif
#if (SIZEOF_CURL_OFF_T > SIZEOF_LONG)
# define MPRNT_SUFFIX_CURL_OFF_T LL
#else
# define MPRNT_SUFFIX_CURL_OFF_T L
#endif
#ifdef CURL_ISOCPP
# define MPRNT_OFF_T_C_HELPER2(Val,Suffix) Val ## Suffix
#else
# define MPRNT_OFF_T_C_HELPER2(Val,Suffix) Val/**/Suffix
#endif
#define MPRNT_OFF_T_C_HELPER1(Val,Suffix) MPRNT_OFF_T_C_HELPER2(Val,Suffix)
#define MPRNT_OFF_T_C(Val) MPRNT_OFF_T_C_HELPER1(Val,MPRNT_SUFFIX_CURL_OFF_T)
#define BUFSZ 256
#define USHORT_TESTS_ARRSZ 1 + 100
#define SSHORT_TESTS_ARRSZ 1 + 100
@ -1018,84 +1002,84 @@ static int test_curl_off_t_formatting(void)
int num_cofft_tests = 0;
int failed = 0;
i = 1; co_test[i].num = MPRNT_OFF_T_C(0x7FFFFFFFFFFFFFFF); co_test[i].expected = "9223372036854775807";
i++; co_test[i].num = MPRNT_OFF_T_C(0x7FFFFFFFFFFFFFFE); co_test[i].expected = "9223372036854775806";
i++; co_test[i].num = MPRNT_OFF_T_C(0x7FFFFFFFFFFFFFFD); co_test[i].expected = "9223372036854775805";
i++; co_test[i].num = MPRNT_OFF_T_C(0x7FFFFFFF00000000); co_test[i].expected = "9223372032559808512";
i++; co_test[i].num = MPRNT_OFF_T_C(0x000000007FFFFFFF); co_test[i].expected = "2147483647";
i = 1; co_test[i].num = 0x7FFFFFFFFFFFFFFFLL; co_test[i].expected = "9223372036854775807";
i++; co_test[i].num = 0x7FFFFFFFFFFFFFFE; co_test[i].expected = "9223372036854775806";
i++; co_test[i].num = 0x7FFFFFFFFFFFFFFD; co_test[i].expected = "9223372036854775805";
i++; co_test[i].num = 0x7FFFFFFF00000000; co_test[i].expected = "9223372032559808512";
i++; co_test[i].num = 0x000000007FFFFFFF; co_test[i].expected = "2147483647";
i++; co_test[i].num = MPRNT_OFF_T_C(0x7FFF000000000000); co_test[i].expected = "9223090561878065152";
i++; co_test[i].num = MPRNT_OFF_T_C(0x00007FFF00000000); co_test[i].expected = "140733193388032";
i++; co_test[i].num = MPRNT_OFF_T_C(0x000000007FFF0000); co_test[i].expected = "2147418112";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000007FFF); co_test[i].expected = "32767";
i++; co_test[i].num = 0x7FFF000000000000; co_test[i].expected = "9223090561878065152";
i++; co_test[i].num = 0x00007FFF00000000; co_test[i].expected = "140733193388032";
i++; co_test[i].num = 0x000000007FFF0000; co_test[i].expected = "2147418112";
i++; co_test[i].num = 0x0000000000007FFF; co_test[i].expected = "32767";
i++; co_test[i].num = MPRNT_OFF_T_C(0x7F00000000000000); co_test[i].expected = "9151314442816847872";
i++; co_test[i].num = MPRNT_OFF_T_C(0x007F000000000000); co_test[i].expected = "35747322042253312";
i++; co_test[i].num = MPRNT_OFF_T_C(0x00007F0000000000); co_test[i].expected = "139637976727552";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000007F00000000); co_test[i].expected = "545460846592";
i++; co_test[i].num = MPRNT_OFF_T_C(0x000000007F000000); co_test[i].expected = "2130706432";
i++; co_test[i].num = MPRNT_OFF_T_C(0x00000000007F0000); co_test[i].expected = "8323072";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000007F00); co_test[i].expected = "32512";
i++; co_test[i].num = MPRNT_OFF_T_C(0x000000000000007F); co_test[i].expected = "127";
i++; co_test[i].num = 0x7F00000000000000; co_test[i].expected = "9151314442816847872";
i++; co_test[i].num = 0x007F000000000000; co_test[i].expected = "35747322042253312";
i++; co_test[i].num = 0x00007F0000000000; co_test[i].expected = "139637976727552";
i++; co_test[i].num = 0x0000007F00000000; co_test[i].expected = "545460846592";
i++; co_test[i].num = 0x000000007F000000; co_test[i].expected = "2130706432";
i++; co_test[i].num = 0x00000000007F0000; co_test[i].expected = "8323072";
i++; co_test[i].num = 0x0000000000007F00; co_test[i].expected = "32512";
i++; co_test[i].num = 0x000000000000007F; co_test[i].expected = "127";
i++; co_test[i].num = MPRNT_OFF_T_C(0x7000000000000000); co_test[i].expected = "8070450532247928832";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0700000000000000); co_test[i].expected = "504403158265495552";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0070000000000000); co_test[i].expected = "31525197391593472";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0007000000000000); co_test[i].expected = "1970324836974592";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000700000000000); co_test[i].expected = "123145302310912";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000070000000000); co_test[i].expected = "7696581394432";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000007000000000); co_test[i].expected = "481036337152";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000700000000); co_test[i].expected = "30064771072";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000070000000); co_test[i].expected = "1879048192";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000007000000); co_test[i].expected = "117440512";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000700000); co_test[i].expected = "7340032";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000070000); co_test[i].expected = "458752";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000007000); co_test[i].expected = "28672";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000000700); co_test[i].expected = "1792";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000000070); co_test[i].expected = "112";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000000007); co_test[i].expected = "7";
i++; co_test[i].num = 0x7000000000000000; co_test[i].expected = "8070450532247928832";
i++; co_test[i].num = 0x0700000000000000; co_test[i].expected = "504403158265495552";
i++; co_test[i].num = 0x0070000000000000; co_test[i].expected = "31525197391593472";
i++; co_test[i].num = 0x0007000000000000; co_test[i].expected = "1970324836974592";
i++; co_test[i].num = 0x0000700000000000; co_test[i].expected = "123145302310912";
i++; co_test[i].num = 0x0000070000000000; co_test[i].expected = "7696581394432";
i++; co_test[i].num = 0x0000007000000000; co_test[i].expected = "481036337152";
i++; co_test[i].num = 0x0000000700000000; co_test[i].expected = "30064771072";
i++; co_test[i].num = 0x0000000070000000; co_test[i].expected = "1879048192";
i++; co_test[i].num = 0x0000000007000000; co_test[i].expected = "117440512";
i++; co_test[i].num = 0x0000000000700000; co_test[i].expected = "7340032";
i++; co_test[i].num = 0x0000000000070000; co_test[i].expected = "458752";
i++; co_test[i].num = 0x0000000000007000; co_test[i].expected = "28672";
i++; co_test[i].num = 0x0000000000000700; co_test[i].expected = "1792";
i++; co_test[i].num = 0x0000000000000070; co_test[i].expected = "112";
i++; co_test[i].num = 0x0000000000000007; co_test[i].expected = "7";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000000001); co_test[i].expected = "1";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000000000); co_test[i].expected = "0";
i++; co_test[i].num = 0x0000000000000001; co_test[i].expected = "1";
i++; co_test[i].num = 0x0000000000000000; co_test[i].expected = "0";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7FFFFFFFFFFFFFFF) -MPRNT_OFF_T_C(1); co_test[i].expected = "-9223372036854775808";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7FFFFFFFFFFFFFFE) -MPRNT_OFF_T_C(1); co_test[i].expected = "-9223372036854775807";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7FFFFFFFFFFFFFFD) -MPRNT_OFF_T_C(1); co_test[i].expected = "-9223372036854775806";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7FFFFFFF00000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-9223372032559808513";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x000000007FFFFFFF) -MPRNT_OFF_T_C(1); co_test[i].expected = "-2147483648";
i++; co_test[i].num = -0x7FFFFFFFFFFFFFFFLL - 1; co_test[i].expected = "-9223372036854775808";
i++; co_test[i].num = -0x7FFFFFFFFFFFFFFE -1; co_test[i].expected = "-9223372036854775807";
i++; co_test[i].num = -0x7FFFFFFFFFFFFFFD -1; co_test[i].expected = "-9223372036854775806";
i++; co_test[i].num = -0x7FFFFFFF00000000 -1; co_test[i].expected = "-9223372032559808513";
i++; co_test[i].num = -0x000000007FFFFFFF -1; co_test[i].expected = "-2147483648";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7FFF000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-9223090561878065153";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x00007FFF00000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-140733193388033";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x000000007FFF0000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-2147418113";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000007FFF) -MPRNT_OFF_T_C(1); co_test[i].expected = "-32768";
i++; co_test[i].num = -0x7FFF000000000000 -1; co_test[i].expected = "-9223090561878065153";
i++; co_test[i].num = -0x00007FFF00000000 -1; co_test[i].expected = "-140733193388033";
i++; co_test[i].num = -0x000000007FFF0000 -1; co_test[i].expected = "-2147418113";
i++; co_test[i].num = -0x0000000000007FFF -1; co_test[i].expected = "-32768";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7F00000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-9151314442816847873";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x007F000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-35747322042253313";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x00007F0000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-139637976727553";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000007F00000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-545460846593";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x000000007F000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-2130706433";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x00000000007F0000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-8323073";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000007F00) -MPRNT_OFF_T_C(1); co_test[i].expected = "-32513";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x000000000000007F) -MPRNT_OFF_T_C(1); co_test[i].expected = "-128";
i++; co_test[i].num = -0x7F00000000000000 -1; co_test[i].expected = "-9151314442816847873";
i++; co_test[i].num = -0x007F000000000000 -1; co_test[i].expected = "-35747322042253313";
i++; co_test[i].num = -0x00007F0000000000 -1; co_test[i].expected = "-139637976727553";
i++; co_test[i].num = -0x0000007F00000000 -1; co_test[i].expected = "-545460846593";
i++; co_test[i].num = -0x000000007F000000 -1; co_test[i].expected = "-2130706433";
i++; co_test[i].num = -0x00000000007F0000 -1; co_test[i].expected = "-8323073";
i++; co_test[i].num = -0x0000000000007F00 -1; co_test[i].expected = "-32513";
i++; co_test[i].num = -0x000000000000007F -1; co_test[i].expected = "-128";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x7000000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-8070450532247928833";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0700000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-504403158265495553";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0070000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-31525197391593473";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0007000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-1970324836974593";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000700000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-123145302310913";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000070000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-7696581394433";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000007000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-481036337153";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000700000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-30064771073";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000070000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-1879048193";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000007000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-117440513";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000700000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-7340033";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000070000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-458753";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000007000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-28673";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000000700) -MPRNT_OFF_T_C(1); co_test[i].expected = "-1793";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000000070) -MPRNT_OFF_T_C(1); co_test[i].expected = "-113";
i++; co_test[i].num = -MPRNT_OFF_T_C(0x0000000000000007) -MPRNT_OFF_T_C(1); co_test[i].expected = "-8";
i++; co_test[i].num = -0x7000000000000000 -1; co_test[i].expected = "-8070450532247928833";
i++; co_test[i].num = -0x0700000000000000 -1; co_test[i].expected = "-504403158265495553";
i++; co_test[i].num = -0x0070000000000000 -1; co_test[i].expected = "-31525197391593473";
i++; co_test[i].num = -0x0007000000000000 -1; co_test[i].expected = "-1970324836974593";
i++; co_test[i].num = -0x0000700000000000 -1; co_test[i].expected = "-123145302310913";
i++; co_test[i].num = -0x0000070000000000 -1; co_test[i].expected = "-7696581394433";
i++; co_test[i].num = -0x0000007000000000 -1; co_test[i].expected = "-481036337153";
i++; co_test[i].num = -0x0000000700000000 -1; co_test[i].expected = "-30064771073";
i++; co_test[i].num = -0x0000000070000000 -1; co_test[i].expected = "-1879048193";
i++; co_test[i].num = -0x0000000007000000 -1; co_test[i].expected = "-117440513";
i++; co_test[i].num = -0x0000000000700000 -1; co_test[i].expected = "-7340033";
i++; co_test[i].num = -0x0000000000070000 -1; co_test[i].expected = "-458753";
i++; co_test[i].num = -0x0000000000007000 -1; co_test[i].expected = "-28673";
i++; co_test[i].num = -0x0000000000000700 -1; co_test[i].expected = "-1793";
i++; co_test[i].num = -0x0000000000000070 -1; co_test[i].expected = "-113";
i++; co_test[i].num = -0x0000000000000007 -1; co_test[i].expected = "-8";
i++; co_test[i].num = MPRNT_OFF_T_C(0x0000000000000000) -MPRNT_OFF_T_C(1); co_test[i].expected = "-1";
i++; co_test[i].num = 0x0000000000000000 -1; co_test[i].expected = "-1";
num_cofft_tests = i;