From 56055f788cd9cec0256e79d0db0b53885d7a18b0 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 4 Jun 2013 12:29:32 +0200 Subject: Revert "dbwrap: dbwrap_fetch_locked_timeout()." This reverts commit f6eb187fdab6b8088bb065e418fe604c4eba7751. Signed-off-by: Volker Lendecke Reviewed-by: Rusty Russell Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Thu Jun 6 14:26:26 CEST 2013 on sn-devel-104 --- lib/dbwrap/dbwrap.c | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'lib/dbwrap/dbwrap.c') diff --git a/lib/dbwrap/dbwrap.c b/lib/dbwrap/dbwrap.c index f03514dc35..44e20bce5f 100644 --- a/lib/dbwrap/dbwrap.c +++ b/lib/dbwrap/dbwrap.c @@ -256,33 +256,6 @@ struct db_record *dbwrap_try_fetch_locked(struct db_context *db, ? db->try_fetch_locked : db->fetch_locked); } -struct db_record *dbwrap_fetch_locked_timeout(struct db_context *db, - TALLOC_CTX *mem_ctx, - TDB_DATA key, - unsigned int timeout) -{ - struct db_record *rec; - struct dbwrap_lock_order_state *lock_order; - TALLOC_CTX *frame = talloc_stackframe(); - - lock_order = dbwrap_check_lock_order(db, frame); - if (lock_order == NULL) { - TALLOC_FREE(frame); - return NULL; - } - rec = db->fetch_locked_timeout - ? db->fetch_locked_timeout(db, mem_ctx, key, timeout) - : db->fetch_locked(db, mem_ctx, key); - if (rec == NULL) { - TALLOC_FREE(frame); - return NULL; - } - (void)talloc_steal(rec, lock_order); - rec->db = db; - TALLOC_FREE(frame); - return rec; -} - struct db_context *dbwrap_record_get_db(struct db_record *rec) { return rec->db; -- cgit