From 35fb513a0814f2d41816ef4aa1211e08e402cdf6 Mon Sep 17 00:00:00 2001 From: Matthias Andreas Benkard Date: Thu, 1 Sep 2011 19:44:42 +0200 Subject: Rename bpt_leaf.release_hook -> bpt_leaf.dealloc_hook. --- bitmapped_patricia_tree.c | 18 +++++++++--------- bitmapped_patricia_tree.h | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bitmapped_patricia_tree.c b/bitmapped_patricia_tree.c index 7575c5e..ca36271 100644 --- a/bitmapped_patricia_tree.c +++ b/bitmapped_patricia_tree.c @@ -70,8 +70,8 @@ struct bpt { struct bpt_leaf { struct bpt bpt; // poor man's inheritance void *value; -#ifdef BPT_ENABLE_RELEASE_HOOKS - void (*release_hook)(bpt_key_t, void *); // not actually used anywhere in client code +#ifdef BPT_ENABLE_DEALLOC_HOOKS + void (*dealloc_hook)(bpt_key_t, void *); // not actually used anywhere in client code #endif }; @@ -89,8 +89,8 @@ void init_bpt_leaf(bpt_t a_leaf, bpt_key_t key, void *value) { leaf->bpt.mutable = true; leaf->bpt.prefix = key; leaf->value = value; -#ifdef BPT_ENABLE_RELEASE_HOOKS - leaf->release_hook = NULL; +#ifdef BPT_ENABLE_DEALLOC_HOOKS + leaf->dealloc_hook = NULL; #endif leaf->bpt.refcount = 1; } @@ -451,9 +451,9 @@ void bpt_dealloc(bpt_t bpt) { if (bpt) { if (bpt->tag == BPT_LEAF) { bpt_leaf_t b = (bpt_leaf_t)bpt; -#ifdef BPT_ENABLE_RELEASE_HOOKS - if (b->release_hook) { - b->release_hook(b->bpt.prefix, b->value); +#ifdef BPT_ENABLE_DEALLOC_HOOKS + if (b->dealloc_hook) { + b->dealloc_hook(b->bpt.prefix, b->value); } #endif free(b); @@ -466,10 +466,10 @@ void bpt_dealloc(bpt_t bpt) { } } -#ifdef BPT_ENABLE_RELEASE_HOOKS +#ifdef BPT_ENABLE_DEALLOC_HOOKS void bpt_leaf_set_dealloc_hook(bpt_leaf_t bpt, void (*hook)(bpt_key_t, void*)) { if (bpt) { - bpt->release_hook = hook; + bpt->dealloc_hook = hook; } } diff --git a/bitmapped_patricia_tree.h b/bitmapped_patricia_tree.h index 4f47aae..b1a3e32 100644 --- a/bitmapped_patricia_tree.h +++ b/bitmapped_patricia_tree.h @@ -30,7 +30,7 @@ extern "C" { #endif -#define BPT_ENABLE_RELEASE_HOOKS 1 +#define BPT_ENABLE_DEALLOC_HOOKS 1 typedef int32_t bpt_key_t; typedef int32_t bpt_key_bitmask_t; @@ -55,7 +55,7 @@ void bpt_release(bpt_t bpt); void bpt_dealloc(bpt_t bpt); void bpt_seal(bpt_t bpt); -#ifdef BPT_ENABLE_RELEASE_HOOKS +#ifdef BPT_ENABLE_DEALLOC_HOOKS void bpt_set_dealloc_hook(bpt_t bpt, bpt_key_t key, void (*hook)(bpt_key_t key, void* value)); #endif -- cgit v1.2.3