X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=8d961e82c365c6b0f6956fbf1019451c285597f5;hp=b84c2f980db36252d6df496fcb00e12dc87619fa;hb=0fd5be2955f8e6487c0f4ab711e2a6958bb8f412;hpb=de432e8f857ce23bccde7c6ffa3e7e21456df18b;ds=sidebyside

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index b84c2f98..8d961e82 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -298,9 +298,6 @@ struct tdb_access_hdr {
 };
 
 struct tdb_file {
-	/* Single list of all TDBs, to detect multiple opens. */
-	struct tdb_file *next;
-
 	/* How many are sharing us? */
 	unsigned int refcnt;
 
@@ -325,38 +322,42 @@ struct tdb_file {
 };
 
 struct tdb_context {
+	/* Single list of all TDBs, to detect multiple opens. */
+	struct tdb_context *next;
+
 	/* Filename of the database. */
 	const char *name;
 
-	/* Are we accessing directly? (debugging check). */
-	int direct_access;
-
-	/* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
-	bool read_only;
-
-	/* mmap read only? */
-	int mmap_flags;
-
-	/* the flags passed to tdb_open, for tdb_reopen. */
-	uint32_t flags;
-
 	/* Logging function */
 	void (*log_fn)(struct tdb_context *tdb,
 		       enum tdb_log_level level,
+		       enum TDB_ERROR ecode,
 		       const char *message,
 		       void *data);
 	void *log_data;
 
-	/* Hash function. */
-	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
-	void *hash_data;
-	uint64_t hash_seed;
+	/* Open flags passed to tdb_open. */
+	int open_flags;
 
 	/* low level (fnctl) lock functions. */
 	int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
 	int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
 	void *lock_data;
 
+	/* the flags passed to tdb_open. */
+	uint32_t flags;
+
+	/* Our statistics. */
+	struct tdb_attribute_stats stats;
+
+	/* Are we accessing directly? (debugging check). */
+	int direct_access;
+
+	/* Hash function. */
+	uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
+	void *hash_data;
+	uint64_t hash_seed;
+
 	/* Set if we are in a transaction. */
 	struct tdb_transaction *transaction;
 	
@@ -364,12 +365,13 @@ struct tdb_context {
 	tdb_off_t ftable_off;
 	unsigned int ftable;
 
+	/* Our open hook, if any. */
+	enum TDB_ERROR (*openhook)(int fd, void *data);
+	void *openhook_data;
+
 	/* IO methods: changes for transactions. */
 	const struct tdb_methods *methods;
 
-	/* Our statistics. */
-	struct tdb_attribute_stats stats;
-
 	/* Direct access information */
 	struct tdb_access_hdr *access;