idtree: use ccan/tal instead of talloc

[ccan] / ccan / idtree / idtree.c

diff --git a/ccan/idtree/idtree.c b/ccan/idtree/idtree.c
index bf83c31856e8a6bdea8d8f4040b347c990ecbb99..e8873926a79c07a21b7b843f06b3b4cfaa7078c9 100644 (file)
--- a/ccan/idtree/idtree.c
+++ b/ccan/idtree/idtree.c
@@ -25,7 +25,7 @@
 */
 
 #include <ccan/idtree/idtree.h>
-#include <ccan/talloc/talloc.h>
+#include <ccan/tal/tal.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -87,7 +87,7 @@ static void free_layer(struct idtree *idp, struct idtree_layer *p)
 static int idtree_pre_get(struct idtree *idp)
 {
        while (idp->id_free_cnt < IDTREE_FREE_MAX) {
-               struct idtree_layer *pn = talloc_zero(idp, struct idtree_layer);
+               struct idtree_layer *pn = talz(idp, struct idtree_layer);
                if(pn == NULL)
                        return (0);
                free_layer(idp, pn);
@@ -99,8 +99,8 @@ static int sub_alloc(struct idtree *idp, const void *ptr, int *starting_id)
 {
        int n, m, sh;
        struct idtree_layer *p, *pn;
-       struct idtree_layer *pa[MAX_LEVEL];
-       int l, id, oid;
+       struct idtree_layer *pa[MAX_LEVEL+1];
+       unsigned int l, id, oid;
        uint32_t bm;
 
        memset(pa, 0, sizeof(pa));
@@ -236,7 +236,7 @@ build_up:
 static int sub_remove(struct idtree *idp, int shift, int id)
 {
        struct idtree_layer *p = idp->top;
-       struct idtree_layer **pa[MAX_LEVEL];
+       struct idtree_layer **pa[1+MAX_LEVEL];
        struct idtree_layer ***paa = &pa[0];
        int n;
 
@@ -276,7 +276,8 @@ void *idtree_lookup(const struct idtree *idp, int id)
         * This tests to see if bits outside the current tree are
         * present.  If so, tain't one of ours!
         */
-       if ((id & ~(~0 << MAX_ID_SHIFT)) >> (n + IDTREE_BITS))
+       if (n + IDTREE_BITS < 31 &&
+           (id & ~(~0 << MAX_ID_SHIFT)) >> (n + IDTREE_BITS))
             return NULL;
 
        /* Mask off upper bits we don't use for the search. */
@@ -312,14 +313,14 @@ bool idtree_remove(struct idtree *idp, int id)
        }
        while (idp->id_free_cnt >= IDTREE_FREE_MAX) {
                p = alloc_layer(idp);
-               talloc_free(p);
+               tal_free(p);
        }
        return true;
 }
 
 struct idtree *idtree_new(void *mem_ctx)
 {
-       return talloc_zero(mem_ctx, struct idtree);
+       return talz(mem_ctx, struct idtree);
 }
 
 int idtree_add(struct idtree *idp, const void *ptr, int limit)