mirror of
https://github.com/curl/curl.git
synced 2026-08-26 16:43:38 +03:00
tidy-up: miscellaneous
- whitespace, indent, comments, clang-format. - openssl: move feature guards within function blocks. - tunit: drop redundant blocks. Closes #20361
This commit is contained in:
Viktor Szakats
parent
2c6f13093e
commit
814b54d83e
45 changed files with 1521 additions and 1527 deletions
|
|
@ -28,48 +28,48 @@
|
|||
static CURLcode test_tool1622(const char *arg)
|
||||
{
|
||||
UNITTEST_BEGIN_SIMPLE
|
||||
{
|
||||
char buffer[9];
|
||||
curl_off_t secs;
|
||||
int i;
|
||||
static const curl_off_t check[] = {
|
||||
/* bytes to check */
|
||||
131072,
|
||||
12645826,
|
||||
1073741824,
|
||||
12938588979,
|
||||
1099445657078333,
|
||||
0 /* end of list */
|
||||
};
|
||||
|
||||
puts("time2str");
|
||||
for(i = 0, secs = 0; i < 63; i++) {
|
||||
time2str(buffer, sizeof(buffer), secs);
|
||||
curl_mprintf("%20" FMT_OFF_T " - %s\n", secs, buffer);
|
||||
if(strlen(buffer) != 8) {
|
||||
curl_mprintf("^^ was too long!\n");
|
||||
}
|
||||
secs *= 2;
|
||||
secs++;
|
||||
char buffer[9];
|
||||
curl_off_t secs;
|
||||
int i;
|
||||
static const curl_off_t check[] = {
|
||||
/* bytes to check */
|
||||
131072,
|
||||
12645826,
|
||||
1073741824,
|
||||
12938588979,
|
||||
1099445657078333,
|
||||
0 /* end of list */
|
||||
};
|
||||
|
||||
puts("time2str");
|
||||
for(i = 0, secs = 0; i < 63; i++) {
|
||||
time2str(buffer, sizeof(buffer), secs);
|
||||
curl_mprintf("%20" FMT_OFF_T " - %s\n", secs, buffer);
|
||||
if(strlen(buffer) != 8) {
|
||||
curl_mprintf("^^ was too long!\n");
|
||||
}
|
||||
puts("max5data");
|
||||
for(i = 0, secs = 0; i < 63; i++) {
|
||||
max5data(secs, buffer, sizeof(buffer));
|
||||
curl_mprintf("%20" FMT_OFF_T " - %s\n", secs, buffer);
|
||||
if(strlen(buffer) != 5) {
|
||||
curl_mprintf("^^ was too long!\n");
|
||||
}
|
||||
secs *= 2;
|
||||
secs++;
|
||||
secs *= 2;
|
||||
secs++;
|
||||
}
|
||||
puts("max5data");
|
||||
for(i = 0, secs = 0; i < 63; i++) {
|
||||
max5data(secs, buffer, sizeof(buffer));
|
||||
curl_mprintf("%20" FMT_OFF_T " - %s\n", secs, buffer);
|
||||
if(strlen(buffer) != 5) {
|
||||
curl_mprintf("^^ was too long!\n");
|
||||
}
|
||||
for(i = 0; check[i]; i++) {
|
||||
secs = check[i];
|
||||
max5data(secs, buffer, sizeof(buffer));
|
||||
curl_mprintf("%20" FMT_OFF_T " - %s\n", secs, buffer);
|
||||
if(strlen(buffer) != 5) {
|
||||
curl_mprintf("^^ was too long!\n");
|
||||
}
|
||||
secs *= 2;
|
||||
secs++;
|
||||
}
|
||||
for(i = 0; check[i]; i++) {
|
||||
secs = check[i];
|
||||
max5data(secs, buffer, sizeof(buffer));
|
||||
curl_mprintf("%20" FMT_OFF_T " - %s\n", secs, buffer);
|
||||
if(strlen(buffer) != 5) {
|
||||
curl_mprintf("^^ was too long!\n");
|
||||
}
|
||||
}
|
||||
|
||||
UNITTEST_END_SIMPLE
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,94 +34,93 @@ struct check1623 {
|
|||
static CURLcode test_tool1623(const char *arg)
|
||||
{
|
||||
UNITTEST_BEGIN_SIMPLE
|
||||
{
|
||||
int i;
|
||||
static const struct check1623 check[] = {
|
||||
{ "0", 0, PARAM_OK},
|
||||
{ "00", 0, PARAM_OK},
|
||||
{ "000", 0, PARAM_OK},
|
||||
{ "1", 1, PARAM_OK},
|
||||
{ "1b", 1, PARAM_OK},
|
||||
{ "99B", 99, PARAM_OK},
|
||||
{ "2", 2, PARAM_OK},
|
||||
{ "3", 3, PARAM_OK},
|
||||
{ "4", 4, PARAM_OK},
|
||||
{ "5", 5, PARAM_OK},
|
||||
{ "6", 6, PARAM_OK},
|
||||
{ "7", 7, PARAM_OK},
|
||||
{ "77", 77, PARAM_OK},
|
||||
{ "8", 8, PARAM_OK},
|
||||
{ "9", 9, PARAM_OK},
|
||||
{ "10", 10, PARAM_OK},
|
||||
{ "010", 10, PARAM_OK},
|
||||
{ "000000000000000000000000000000000010", 10, PARAM_OK},
|
||||
{ "1k", 1024, PARAM_OK},
|
||||
{ "2K", 2048, PARAM_OK},
|
||||
{ "3k", 3072, PARAM_OK},
|
||||
{ "4K", 4096, PARAM_OK},
|
||||
{ "5k", 5120, PARAM_OK},
|
||||
{ "6K", 6144, PARAM_OK},
|
||||
{ "7k", 7168, PARAM_OK},
|
||||
{ "8K", 8192, PARAM_OK},
|
||||
{ "9k", 9216, PARAM_OK},
|
||||
{ "10K", 10240, PARAM_OK},
|
||||
{ "20M", 20971520, PARAM_OK},
|
||||
{ "30G", 32212254720, PARAM_OK},
|
||||
{ "40T", 43980465111040, PARAM_OK},
|
||||
{ "50P", 56294995342131200, PARAM_OK},
|
||||
{ "1.1k", 1126, PARAM_OK},
|
||||
{ "1.01k", 1034, PARAM_OK},
|
||||
{ "1.001k", 1025, PARAM_OK},
|
||||
{ "1.0001k", 1024, PARAM_OK},
|
||||
{ "22.1m", 23173529, PARAM_OK},
|
||||
{ "22.01m", 23079157, PARAM_OK},
|
||||
{ "22.001m", 23069720, PARAM_OK},
|
||||
{ "22.0001m", 23068776, PARAM_OK},
|
||||
{ "22.00001m", 23068682, PARAM_OK},
|
||||
{ "22.000001m", 23068673, PARAM_OK},
|
||||
{ "22.0000001m", 23068672, PARAM_OK},
|
||||
{ "22.000000001m", 23068672, PARAM_OK},
|
||||
{ "3.4", 0, PARAM_BAD_USE},
|
||||
{ "3.14b", 0, PARAM_BAD_USE},
|
||||
{ "5000.9P", 5630512844129278361, PARAM_OK},
|
||||
{ "5000.99P", 5630614175120894197, PARAM_OK},
|
||||
{ "5000.999P", 5630624308220055781, PARAM_OK},
|
||||
{ "5000.9999P", 5630625321529969316, PARAM_OK},
|
||||
{ "8191P", 9222246136947933184, PARAM_OK},
|
||||
{ "8191.9999999P", 9223372036735343194, PARAM_OK},
|
||||
{ "8192P", 0, PARAM_NUMBER_TOO_LARGE},
|
||||
{ "9223372036854775807", 9223372036854775807, PARAM_OK},
|
||||
{ "9223372036854775808", 0, PARAM_NUMBER_TOO_LARGE},
|
||||
{ "a", 0, PARAM_BAD_NUMERIC},
|
||||
{ "-2", 0, PARAM_BAD_NUMERIC},
|
||||
{ "+2", 0, PARAM_BAD_NUMERIC},
|
||||
{ "2,2k", 0, PARAM_BAD_USE},
|
||||
{ NULL, 0, PARAM_OK } /* end of list */
|
||||
};
|
||||
|
||||
for(i = 0; check[i].input; i++) {
|
||||
bool ok = FALSE;
|
||||
curl_off_t output = 0;
|
||||
ParameterError err =
|
||||
GetSizeParameter(check[i].input, &output);
|
||||
if(err != check[i].err)
|
||||
curl_mprintf("'%s' unexpectedly returned %d \n",
|
||||
check[i].input, err);
|
||||
else if(check[i].amount != output)
|
||||
curl_mprintf("'%s' unexpectedly gave %" FMT_OFF_T "\n",
|
||||
check[i].input, output);
|
||||
else {
|
||||
int i;
|
||||
static const struct check1623 check[] = {
|
||||
{ "0", 0, PARAM_OK },
|
||||
{ "00", 0, PARAM_OK },
|
||||
{ "000", 0, PARAM_OK },
|
||||
{ "1", 1, PARAM_OK },
|
||||
{ "1b", 1, PARAM_OK },
|
||||
{ "99B", 99, PARAM_OK },
|
||||
{ "2", 2, PARAM_OK },
|
||||
{ "3", 3, PARAM_OK },
|
||||
{ "4", 4, PARAM_OK },
|
||||
{ "5", 5, PARAM_OK },
|
||||
{ "6", 6, PARAM_OK },
|
||||
{ "7", 7, PARAM_OK },
|
||||
{ "77", 77, PARAM_OK },
|
||||
{ "8", 8, PARAM_OK },
|
||||
{ "9", 9, PARAM_OK },
|
||||
{ "10", 10, PARAM_OK },
|
||||
{ "010", 10, PARAM_OK },
|
||||
{ "000000000000000000000000000000000010", 10, PARAM_OK },
|
||||
{ "1k", 1024, PARAM_OK },
|
||||
{ "2K", 2048, PARAM_OK },
|
||||
{ "3k", 3072, PARAM_OK },
|
||||
{ "4K", 4096, PARAM_OK },
|
||||
{ "5k", 5120, PARAM_OK },
|
||||
{ "6K", 6144, PARAM_OK },
|
||||
{ "7k", 7168, PARAM_OK },
|
||||
{ "8K", 8192, PARAM_OK },
|
||||
{ "9k", 9216, PARAM_OK },
|
||||
{ "10K", 10240, PARAM_OK },
|
||||
{ "20M", 20971520, PARAM_OK },
|
||||
{ "30G", 32212254720, PARAM_OK },
|
||||
{ "40T", 43980465111040, PARAM_OK },
|
||||
{ "50P", 56294995342131200, PARAM_OK },
|
||||
{ "1.1k", 1126, PARAM_OK },
|
||||
{ "1.01k", 1034, PARAM_OK },
|
||||
{ "1.001k", 1025, PARAM_OK },
|
||||
{ "1.0001k", 1024, PARAM_OK },
|
||||
{ "22.1m", 23173529, PARAM_OK },
|
||||
{ "22.01m", 23079157, PARAM_OK },
|
||||
{ "22.001m", 23069720, PARAM_OK },
|
||||
{ "22.0001m", 23068776, PARAM_OK },
|
||||
{ "22.00001m", 23068682, PARAM_OK },
|
||||
{ "22.000001m", 23068673, PARAM_OK },
|
||||
{ "22.0000001m", 23068672, PARAM_OK },
|
||||
{ "22.000000001m", 23068672, PARAM_OK },
|
||||
{ "3.4", 0, PARAM_BAD_USE },
|
||||
{ "3.14b", 0, PARAM_BAD_USE },
|
||||
{ "5000.9P", 5630512844129278361, PARAM_OK },
|
||||
{ "5000.99P", 5630614175120894197, PARAM_OK },
|
||||
{ "5000.999P", 5630624308220055781, PARAM_OK },
|
||||
{ "5000.9999P", 5630625321529969316, PARAM_OK },
|
||||
{ "8191P", 9222246136947933184, PARAM_OK },
|
||||
{ "8191.9999999P", 9223372036735343194, PARAM_OK },
|
||||
{ "8192P", 0, PARAM_NUMBER_TOO_LARGE },
|
||||
{ "9223372036854775807", 9223372036854775807, PARAM_OK },
|
||||
{ "9223372036854775808", 0, PARAM_NUMBER_TOO_LARGE },
|
||||
{ "a", 0, PARAM_BAD_NUMERIC },
|
||||
{ "-2", 0, PARAM_BAD_NUMERIC },
|
||||
{ "+2", 0, PARAM_BAD_NUMERIC },
|
||||
{ "2,2k", 0, PARAM_BAD_USE },
|
||||
{ NULL, 0, PARAM_OK } /* end of list */
|
||||
};
|
||||
|
||||
for(i = 0; check[i].input; i++) {
|
||||
bool ok = FALSE;
|
||||
curl_off_t output = 0;
|
||||
ParameterError err = GetSizeParameter(check[i].input, &output);
|
||||
if(err != check[i].err)
|
||||
curl_mprintf("'%s' unexpectedly returned %d \n",
|
||||
check[i].input, err);
|
||||
else if(check[i].amount != output)
|
||||
curl_mprintf("'%s' unexpectedly gave %" FMT_OFF_T "\n",
|
||||
check[i].input, output);
|
||||
else {
|
||||
#if 0 /* enable for debugging */
|
||||
if(err)
|
||||
curl_mprintf("'%s' returned %d\n", check[i].input, err);
|
||||
else
|
||||
curl_mprintf("'%s' == %" FMT_OFF_T "\n", check[i].input, output);
|
||||
if(err)
|
||||
curl_mprintf("'%s' returned %d\n", check[i].input, err);
|
||||
else
|
||||
curl_mprintf("'%s' == %" FMT_OFF_T "\n", check[i].input, output);
|
||||
#endif
|
||||
ok = TRUE;
|
||||
}
|
||||
if(!ok)
|
||||
unitfail++;
|
||||
ok = TRUE;
|
||||
}
|
||||
if(!ok)
|
||||
unitfail++;
|
||||
}
|
||||
|
||||
UNITTEST_END_SIMPLE
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue