From 26fc72921f7b72dfebfe8394baa85b81ef66d26d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 8 Dec 2011 15:50:33 +0100 Subject: s3-dbwrap: Make dbwrap_parse_record return NTSTATUS Also, the parser now returns void. The parser is called if and only if dbwrap_parse_record returns NT_STATUS_OK. Signed-off-by: Michael Adam --- source3/lib/dbwrap/dbwrap_rbt.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'source3/lib/dbwrap/dbwrap_rbt.c') diff --git a/source3/lib/dbwrap/dbwrap_rbt.c b/source3/lib/dbwrap/dbwrap_rbt.c index 3f280c27de..09bc210f9e 100644 --- a/source3/lib/dbwrap/dbwrap_rbt.c +++ b/source3/lib/dbwrap/dbwrap_rbt.c @@ -330,18 +330,19 @@ static int db_rbt_wipe(struct db_context *db) return 0; } -static int db_rbt_parse_record(struct db_context *db, TDB_DATA key, - int (*parser)(TDB_DATA key, TDB_DATA data, - void *private_data), - void *private_data) +static NTSTATUS db_rbt_parse_record(struct db_context *db, TDB_DATA key, + void (*parser)(TDB_DATA key, TDB_DATA data, + void *private_data), + void *private_data) { struct db_rbt_search_result res; bool found = db_rbt_search_internal(db, key, &res); if (!found) { - return -1; + return NT_STATUS_NOT_FOUND; } - return parser(res.key, res.val, private_data); + parser(res.key, res.val, private_data); + return NT_STATUS_OK; } static NTSTATUS db_rbt_fetch(struct db_context *db, TALLOC_CTX *mem_ctx, -- cgit