swrap: Rename swrap_pcap_get_fd().

[sfrench/samba-autobuild/.git] / lib / dbwrap / dbwrap_rbt.c

diff --git a/lib/dbwrap/dbwrap_rbt.c b/lib/dbwrap/dbwrap_rbt.c
index 3dca3ba793f9fff18f8427203fa90db03a9b155e..3f970865982db486fd2269dda09e105c3f018d9a 100644 (file)
--- a/lib/dbwrap/dbwrap_rbt.c
+++ b/lib/dbwrap/dbwrap_rbt.c
@@ -382,7 +382,6 @@ static int db_rbt_traverse_internal(struct db_context *db,
                return ret;
        }
 
-       ZERO_STRUCT(rec_priv);
        rec_priv.node = db_rbt2node(n);
        /* n might be altered by the callback function */
        n = NULL;
@@ -481,7 +480,7 @@ struct db_context *db_open_rbt(TALLOC_CTX *mem_ctx)
 {
        struct db_context *result;
 
-       result = talloc(mem_ctx, struct db_context);
+       result = talloc_zero(mem_ctx, struct db_context);
 
        if (result == NULL) {
                return NULL;
@@ -495,7 +494,6 @@ struct db_context *db_open_rbt(TALLOC_CTX *mem_ctx)
        }
 
        result->fetch_locked = db_rbt_fetch_locked;
-       result->try_fetch_locked = NULL;
        result->traverse = db_rbt_traverse;
        result->traverse_read = db_rbt_traverse_read;
        result->get_seqnum = db_rbt_get_seqnum;
@@ -505,9 +503,8 @@ struct db_context *db_open_rbt(TALLOC_CTX *mem_ctx)
        result->exists = db_rbt_exists;
        result->wipe = db_rbt_wipe;
        result->parse_record = db_rbt_parse_record;
-       result->lock_order = 0;
        result->id = db_rbt_id;
-       result->stored_callback = NULL;
+       result->name = "dbwrap rbt";
 
        return result;
 }