X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_private.h;h=ae2888c0a719eecbac59bb0c0b57c22fcdb8088f;hp=569ec718580b4f353077af2a71aa86b01f2a2f26;hb=39f55294799c6443c0ad7bef09f1c113cf89d295;hpb=19e6c1a250ade1e7204ada17163294855585e825

diff --git a/ccan/tdb2/tdb1_private.h b/ccan/tdb2/tdb1_private.h
index 569ec718..ae2888c0 100644
--- a/ccan/tdb2/tdb1_private.h
+++ b/ccan/tdb2/tdb1_private.h
@@ -45,11 +45,6 @@
 #include <limits.h>
 #include <stdio.h>
 #include <utime.h>
-
-#ifndef _PUBLIC_
-#define _PUBLIC_
-#endif
-
 #else
 #include "replace.h"
 #include "system/filesys.h"
@@ -61,6 +56,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 +219,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,