Remove unused main() args in many modules.

[ccan] / ccan / container_of / test / run.c

diff --git a/ccan/container_of/test/run.c b/ccan/container_of/test/run.c
index 96ef483c55879e36df948a82f5af847c0dee9df1..32557295ddec1d471e89873b1534bc4b5d2232b7 100644 (file)
--- a/ccan/container_of/test/run.c
+++ b/ccan/container_of/test/run.c
@@ -6,19 +6,25 @@ struct foo {
        char b;
 };
 
-int main(int argc, char *argv[])
+int main(void)
 {
        struct foo foo = { .a = 1, .b = 2 };
        int *intp = &foo.a;
        char *charp = &foo.b;
 
-       plan_tests(6);
+       plan_tests(12);
        ok1(container_of(intp, struct foo, a) == &foo);
        ok1(container_of(charp, struct foo, b) == &foo);
+       ok1(container_of_or_null(intp, struct foo, a) == &foo);
+       ok1(container_of_or_null(charp, struct foo, b) == &foo);
+       ok1(container_of_or_null((int *)NULL, struct foo, a) == NULL);
+       ok1(container_of_or_null((char *)NULL, struct foo, b) == NULL);
        ok1(container_of_var(intp, &foo, a) == &foo);
        ok1(container_of_var(charp, &foo, b) == &foo);
 
        ok1(container_off(struct foo, a) == 0);
        ok1(container_off(struct foo, b) == offsetof(struct foo, b));
+       ok1(container_off_var(&foo, a) == 0);
+       ok1(container_off_var(&foo, b) == offsetof(struct foo, b));
        return exit_status();
 }