container_of: Add container_of_or_null()

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

diff --git a/ccan/container_of/test/run.c b/ccan/container_of/test/run.c
index dd57204d88f839bd15bbe16c3177c9871e00d492..18207f60521f418d75df8cee15293c062acc1a21 100644 (file)
--- a/ccan/container_of/test/run.c
+++ b/ccan/container_of/test/run.c
@@ -1,5 +1,5 @@
-#include "container_of/container_of.h"
-#include "tap/tap.h"
+#include <ccan/container_of/container_of.h>
+#include <ccan/tap/tap.h>
 
 struct foo {
        int a;
@@ -12,10 +12,19 @@ int main(int argc, char *argv[])
        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();
 }