X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fcontainer_of%2Ftest%2Frun.c;h=32557295ddec1d471e89873b1534bc4b5d2232b7;hb=61f58ff94e35c9b8ac5488554e2554bc5c9888b3;hp=f28d9998503dc63e482355927fe66ebfbe445b9d;hpb=39357f4e89f4ac02eb11861812cbfc67b4f1d4ef;p=ccan

diff --git a/ccan/container_of/test/run.c b/ccan/container_of/test/run.c
index f28d9998..32557295 100644
--- a/ccan/container_of/test/run.c
+++ b/ccan/container_of/test/run.c
@@ -6,16 +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(4);
+	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();
 }