tdb2: unify tdb1_traverse into tdb_traverse

[ccan] / ccan / jmap / jmap.c

diff --git a/ccan/jmap/jmap.c b/ccan/jmap/jmap.c
index 279f65192af47c6e57f2698bb2951884363d3e62..78b7ba21b98b5ac56b8e7ff28c7f52b6fc897ddd 100644 (file)
--- a/ccan/jmap/jmap.c
+++ b/ccan/jmap/jmap.c
@@ -1,3 +1,4 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #include <ccan/jmap/jmap.h>
 #include <ccan/build_assert/build_assert.h>
 #include <stdlib.h>
@@ -7,8 +8,10 @@ struct jmap *jmap_new(void)
 {
        struct jmap *map;
 
-       /* Judy uses Word_t, we use size_t. */
-       BUILD_ASSERT(sizeof(size_t) == sizeof(Word_t));
+       /* Judy uses unsigned long for Word_t, we use unsigned long. */
+       BUILD_ASSERT(sizeof(Word_t) == sizeof(unsigned long));
+       /* We also put pointers into Judy, in jmap_types.h */
+       BUILD_ASSERT(sizeof(Word_t) >= sizeof(void *));
 
        map = malloc(sizeof(*map));
        if (map) {
@@ -40,6 +43,6 @@ const char *jmap_error_(struct jmap *map)
 void jmap_free(const struct jmap *map)
 {
        free((char *)map->errstr);
-       Judy1FreeArray((PPvoid_t)&map->judy, PJE0);
+       JudyLFreeArray((PPvoid_t)&map->judy, PJE0);
        free((void *)map);
 }