X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=89e69610d428fe82edf0fc71d160f69e89489225;hp=cc3bd6a96ba2d44ab3993b813119f2fac882e6fa;hb=60210a73ec08a7b34ba637ad19e6749cf6dc1952;hpb=2414f261918b4fb8a549dd385dba32118e37bf85

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index cc3bd6a9..89e69610 100644
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -328,15 +328,6 @@ struct tdb_context {
 	/* Filename of the database. */
 	const char *name;
 
-	/* Are we accessing directly? (debugging check). */
-	int direct_access;
-
-	/* Open flags passed to tdb_open. */
-	int open_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,
@@ -345,16 +336,34 @@ struct tdb_context {
 		       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;
+	/* Last error we returned. */
+	enum TDB_ERROR last_error;
+
+	/* The actual file information */
+	struct tdb_file *file;
+
+	/* 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;
 	
@@ -369,17 +378,9 @@ struct tdb_context {
 	/* 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;
 
-	/* Last error we returned. */
-	enum TDB_ERROR last_error;
-
-	/* The actual file information */
-	struct tdb_file *file;
 };
 
 struct tdb_methods {