Commit abde9907 authored by Rusty Russell's avatar Rusty Russell

opt: fix warnings in test, fix endian assumptions.

In particular, handing an pointer to ULL where a pointer to UL is expected
won't work on big endian.
parent bbdf3ef3
...@@ -399,7 +399,7 @@ int main(int argc, char *argv[]) ...@@ -399,7 +399,7 @@ int main(int argc, char *argv[])
} }
else else
fail("FIXME: Handle other long long int" fail("FIXME: Handle other long long int"
" sizes (specifically %lu bytes)", " sizes (specifically %zu bytes)",
sizeof(long long)); sizeof(long long));
} }
/* opt_set_ulonglongval_bi */ /* opt_set_ulonglongval_bi */
...@@ -566,19 +566,19 @@ int main(int argc, char *argv[]) ...@@ -566,19 +566,19 @@ int main(int argc, char *argv[])
char buf[OPT_SHOW_LEN+2] = { 0 }; char buf[OPT_SHOW_LEN+2] = { 0 };
buf[OPT_SHOW_LEN] = '!'; buf[OPT_SHOW_LEN] = '!';
i = 7777; i = 7777;
opt_show_ulonglongval_bi(buf, &i); opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "7777") == 0); ok1(strcmp(buf, "7777") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
i = 10240000 * k; i = 10240000 * k;
opt_show_ulonglongval_bi(buf, &i); opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "10000M") == 0); ok1(strcmp(buf, "10000M") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
i = 5 * P; i = 5 * P;
opt_show_ulonglongval_bi(buf, &i); opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "5P") == 0); ok1(strcmp(buf, "5P") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
i = 1024 * P; i = 1024 * P;
opt_show_ulonglongval_bi(buf, &i); opt_show_ulonglongval_bi(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "1E") == 0); ok1(strcmp(buf, "1E") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
} }
...@@ -652,7 +652,7 @@ int main(int argc, char *argv[]) ...@@ -652,7 +652,7 @@ int main(int argc, char *argv[])
/* opt_set_ulongval_si */ /* opt_set_ulongval_si */
{ {
unsigned long long int arg = 1000; unsigned long int arg = 1000;
reset_options(); reset_options();
opt_register_arg("-a", opt_set_ulongval_si, NULL, opt_register_arg("-a", opt_set_ulongval_si, NULL,
...@@ -677,7 +677,7 @@ int main(int argc, char *argv[]) ...@@ -677,7 +677,7 @@ int main(int argc, char *argv[])
ok1(arg == 1 * G); ok1(arg == 1 * G);
ok1(!parse_args(&argc, &argv, "-a", "-1G", NULL)); ok1(!parse_args(&argc, &argv, "-a", "-1G", NULL));
ok1(parse_args(&argc, &argv, "-a", "4G", NULL)); ok1(parse_args(&argc, &argv, "-a", "4G", NULL));
ok1(arg == 4000000000); ok1(arg == 4000000000U);
if (sizeof(long) == 4){ if (sizeof(long) == 4){
ok1(!parse_args(&argc, &argv, "-a", "4294967296", NULL)); ok1(!parse_args(&argc, &argv, "-a", "4294967296", NULL));
ok1(!parse_args(&argc, &argv, "-a", "4295M", NULL)); ok1(!parse_args(&argc, &argv, "-a", "4295M", NULL));
...@@ -784,7 +784,7 @@ int main(int argc, char *argv[]) ...@@ -784,7 +784,7 @@ int main(int argc, char *argv[])
} }
else else
fail("FIXME: Handle other long long int" fail("FIXME: Handle other long long int"
" sizes (specifically %lu bytes)", " sizes (specifically %zu bytes)",
sizeof(long long)); sizeof(long long));
} }
...@@ -950,19 +950,19 @@ int main(int argc, char *argv[]) ...@@ -950,19 +950,19 @@ int main(int argc, char *argv[])
char buf[OPT_SHOW_LEN+2] = { 0 }; char buf[OPT_SHOW_LEN+2] = { 0 };
buf[OPT_SHOW_LEN] = '!'; buf[OPT_SHOW_LEN] = '!';
i = 7777; i = 7777;
opt_show_ulonglongval_si(buf, &i); opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "7777") == 0); ok1(strcmp(buf, "7777") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
i = 10240000 * k; i = 10240000 * k;
opt_show_ulonglongval_si(buf, &i); opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "10240M") == 0); ok1(strcmp(buf, "10240M") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
i = 5 * P; i = 5 * P;
opt_show_ulonglongval_si(buf, &i); opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "5P") == 0); ok1(strcmp(buf, "5P") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
i = 1000 * P; i = 1000 * P;
opt_show_ulonglongval_si(buf, &i); opt_show_ulonglongval_si(buf, (unsigned long long *)&i);
ok1(strcmp(buf, "1E") == 0); ok1(strcmp(buf, "1E") == 0);
ok1(buf[OPT_SHOW_LEN] == '!'); ok1(buf[OPT_SHOW_LEN] == '!');
} }
...@@ -994,8 +994,8 @@ int main(int argc, char *argv[]) ...@@ -994,8 +994,8 @@ int main(int argc, char *argv[])
argc = 2; argc = 2;
argv = malloc(sizeof(argv[0]) * 3); argv = malloc(sizeof(argv[0]) * 3);
argv[0] = "thisprog"; argv[0] = (char *)"thisprog";
argv[1] = "-a"; argv[1] = (char *)"-a";
argv[2] = NULL; argv[2] = NULL;
exitval = setjmp(exited); exitval = setjmp(exited);
...@@ -1020,8 +1020,8 @@ int main(int argc, char *argv[]) ...@@ -1020,8 +1020,8 @@ int main(int argc, char *argv[])
argc = 2; argc = 2;
argv = malloc(sizeof(argv[0]) * 3); argv = malloc(sizeof(argv[0]) * 3);
argv[0] = "thisprog"; argv[0] = (char *)"thisprog";
argv[1] = "-a"; argv[1] = (char *)"-a";
argv[2] = NULL; argv[2] = NULL;
exitval = setjmp(exited); exitval = setjmp(exited);
...@@ -1159,8 +1159,8 @@ int main(int argc, char *argv[]) ...@@ -1159,8 +1159,8 @@ int main(int argc, char *argv[])
argc = 2; argc = 2;
argv = malloc(sizeof(argv[0]) * 3); argv = malloc(sizeof(argv[0]) * 3);
argv[0] = "thisprog"; argv[0] = (char *)"thisprog";
argv[1] = "--garbage"; argv[1] = (char *)"--garbage";
argv[2] = NULL; argv[2] = NULL;
ok1(!opt_parse(&argc, argv, opt_log_stderr)); ok1(!opt_parse(&argc, argv, opt_log_stderr));
ok1(!strcmp(output, ok1(!strcmp(output,
...@@ -1178,8 +1178,8 @@ int main(int argc, char *argv[]) ...@@ -1178,8 +1178,8 @@ int main(int argc, char *argv[])
opt_usage_and_exit, "[args]", ""); opt_usage_and_exit, "[args]", "");
argc = 2; argc = 2;
argv = malloc(sizeof(argv[0]) * 3); argv = malloc(sizeof(argv[0]) * 3);
argv[0] = "thisprog"; argv[0] = (char *)"thisprog";
argv[1] = "--garbage"; argv[1] = (char *)"--garbage";
argv[2] = NULL; argv[2] = NULL;
exitval = setjmp(exited); exitval = setjmp(exited);
if (exitval == 0) { if (exitval == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment