From e9fe56cdf3285295642db09b70b673d865551b4a Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 07:25:13 +0930 Subject: tdb2: Remove unused tdb1 functions. We're going to use TDB2's API, so some TDB1 APIs are obviously unnecessary. We also get rid of USE_RIGHT_MERGES and TRACE code. Signed-off-by: Rusty Russell (Imported from CCAN commit b929638e3cfe629285af3ecd0813e03eaeaa1133) --- lib/tdb2/tdb1_private.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib/tdb2/tdb1_private.h') diff --git a/lib/tdb2/tdb1_private.h b/lib/tdb2/tdb1_private.h index 569ec71858..b34d4dd1ba 100644 --- a/lib/tdb2/tdb1_private.h +++ b/lib/tdb2/tdb1_private.h @@ -61,6 +61,9 @@ #include "tdb1.h" +/* Temporary wrapper to avoid undue churn in test/ */ +#define tdb1_error(tdb) ((tdb)->ecode) + /* #define TDB_TRACE 1 */ #ifndef HAVE_GETPAGESIZE #define getpagesize() 0x2000 @@ -221,20 +224,14 @@ struct tdb1_context { struct tdb1_transaction *transaction; int page_size; int max_dead_records; -#ifdef TDB1_TRACE - int tracefd; -#endif - volatile sig_atomic_t *interrupt_sig_ptr; }; - /* internal prototypes */ int tdb1_munmap(struct tdb1_context *tdb); void tdb1_mmap(struct tdb1_context *tdb); int tdb1_lock(struct tdb1_context *tdb, int list, int ltype); -int tdb1_lock_nonblock(struct tdb1_context *tdb, int list, int ltype); int tdb1_nest_lock(struct tdb1_context *tdb, uint32_t offset, int ltype, enum tdb1_lock_flags flags); int tdb1_nest_unlock(struct tdb1_context *tdb, uint32_t offset, int ltype, -- cgit