X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fjmap%2Fjmap.c;h=8982a7155ca73bc7059c441d4cdff539e13c40f1;hb=b1f28e17227f2320d07fe052a8a48942fe17caa5;hp=38b912fd200b98b1c5df8074c1a77d188306fd37;hpb=74257cee33ae3033f961d5f22a0313b8cb1b18d4;p=ccan diff --git a/ccan/jmap/jmap.c b/ccan/jmap/jmap.c index 38b912fd..8982a715 100644 --- a/ccan/jmap/jmap.c +++ b/ccan/jmap/jmap.c @@ -4,7 +4,7 @@ #include #include -struct jmap *jmap_new(void) +struct jmap *jmap_new_(size_t size) { struct jmap *map; @@ -13,7 +13,8 @@ struct jmap *jmap_new(void) /* We also put pointers into Judy, in jmap_types.h */ BUILD_ASSERT(sizeof(Word_t) >= sizeof(void *)); - map = malloc(sizeof(*map)); + assert(size >= sizeof(*map)); + map = malloc(size); if (map) { map->judy = NULL; memset(&map->err, 0, sizeof(map->err)); @@ -26,7 +27,7 @@ struct jmap *jmap_new(void) return map; } -const char *jmap_error_(struct jmap *map) +const char *jmap_error_str_(struct jmap *map) { char *str; free((char *)map->errstr); @@ -40,9 +41,9 @@ const char *jmap_error_(struct jmap *map) return str; } -void jmap_free(const 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); }