diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 12:42:08 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2012-06-19 05:38:07 +0200 |
commit | d938c0b591d9c4aff9c92ae5eedd26ed97455f42 (patch) | |
tree | e3744f9c660fbf23d759493e0391d577e528ffcd /lib/ntdb/traverse.c | |
parent | 6d5a3e1602a1db8ca8e778f5e4f40bb623dff1e7 (diff) | |
download | samba-d938c0b591d9c4aff9c92ae5eedd26ed97455f42.tar.gz samba-d938c0b591d9c4aff9c92ae5eedd26ed97455f42.tar.bz2 samba-d938c0b591d9c4aff9c92ae5eedd26ed97455f42.zip |
ntdb: allocator attribute.
This is designed to allow us to make ntdb_context (and NTDB_DATA returned
from ntdb_fetch) a talloc pointer. But it can also be used for any other
alternate allocator.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/ntdb/traverse.c')
-rw-r--r-- | lib/ntdb/traverse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ntdb/traverse.c b/lib/ntdb/traverse.c index 45478755bd..ee1e1006db 100644 --- a/lib/ntdb/traverse.c +++ b/lib/ntdb/traverse.c @@ -36,10 +36,10 @@ _PUBLIC_ int64_t ntdb_traverse_(struct ntdb_context *ntdb, count++; if (fn && fn(ntdb, k, d, p)) { - free(k.dptr); + ntdb->free_fn(k.dptr, ntdb->alloc_data); return count; } - free(k.dptr); + ntdb->free_fn(k.dptr, ntdb->alloc_data); } if (ecode != NTDB_ERR_NOEXIST) { @@ -63,7 +63,7 @@ _PUBLIC_ enum NTDB_ERROR ntdb_nextkey(struct ntdb_context *ntdb, NTDB_DATA *key) struct ntdb_used_record rec; tinfo.prev = find_and_lock(ntdb, *key, F_RDLCK, &h, &rec, &tinfo); - free(key->dptr); + ntdb->free_fn(key->dptr, ntdb->alloc_data); if (NTDB_OFF_IS_ERR(tinfo.prev)) { return NTDB_OFF_TO_ERR(tinfo.prev); } |