From 2d52f6f8f5ea579fbbfff2d42a4ba9ed897a60ff Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 17 Aug 2011 08:40:53 +0200 Subject: [PATCH] s3:dbwrap: move dbwrap_traverse() to dbwrap.c, the core of the dbrwap subsystem --- source3/lib/dbwrap/dbwrap.c | 8 ++++++++ source3/lib/dbwrap/dbwrap_util.c | 9 --------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c index e9baa13c1be..f0d61a9a2f2 100644 --- a/source3/lib/dbwrap/dbwrap.c +++ b/source3/lib/dbwrap/dbwrap.c @@ -108,3 +108,11 @@ NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key) TALLOC_FREE(rec); return status; } + +NTSTATUS dbwrap_traverse(struct db_context *db, + int (*f)(struct db_record*, void*), + void *private_data) +{ + int ret = db->traverse(db, f, private_data); + return (ret < 0) ? NT_STATUS_INTERNAL_DB_CORRUPTION : NT_STATUS_OK; +} diff --git a/source3/lib/dbwrap/dbwrap_util.c b/source3/lib/dbwrap/dbwrap_util.c index 9ca781caf23..b9963f27065 100644 --- a/source3/lib/dbwrap/dbwrap_util.c +++ b/source3/lib/dbwrap/dbwrap_util.c @@ -447,15 +447,6 @@ NTSTATUS dbwrap_trans_traverse(struct db_context *db, return dbwrap_trans_do(db, dbwrap_trans_traverse_action, &ctx); } -NTSTATUS dbwrap_traverse(struct db_context *db, - int (*f)(struct db_record*, void*), - void *private_data) -{ - int ret = db->traverse(db, f, private_data); - return (ret < 0) ? NT_STATUS_INTERNAL_DB_CORRUPTION : NT_STATUS_OK; -} - - NTSTATUS dbwrap_delete_bystring(struct db_context *db, const char *key) { return dbwrap_delete(db, string_term_tdb_data(key)); -- 2.11.4.GIT