X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;ds=sidebyside;f=ccan%2Ftdb2%2Ftdb1_open.c;h=1f23db0126ae07afcbf2629fa584714bb3b9bdcf;hb=a446f1d4d161d66bbb19ba2551cf6429a4865964;hp=5d0097b2a79ac2de54875414cf8c0485d3d7357e;hpb=97224cbbe29e76522ec38d031c54b1cadce8ae03;p=ccan

diff --git a/ccan/tdb2/tdb1_open.c b/ccan/tdb2/tdb1_open.c
index 5d0097b2..1f23db01 100644
--- a/ccan/tdb2/tdb1_open.c
+++ b/ccan/tdb2/tdb1_open.c
@@ -95,23 +95,15 @@ static int tdb1_new_database(struct tdb_context *tdb, int hash_size)
 	return ret;
 }
 
+typedef void (*tdb1_log_func)(struct tdb_context *, enum tdb_log_level, enum TDB_ERROR,
+			      const char *, void *);
+typedef uint64_t (*tdb1_hash_func)(const void *key, size_t len, uint64_t seed,
+				   void *data);
 
-
-/* open the database, creating it if necessary
-
-   The open_flags and mode are passed straight to the open call on the
-   database file. A flags value of O_WRONLY is invalid. The hash size
-   is advisory, use zero for a default value.
-
-   Return is NULL on error, in which case errno is also set.  Don't
-   try to call tdb1_error or tdb1_errname, just do strerror(errno).
-
-   @param name may be NULL for internal databases. */
-struct tdb_context *tdb1_open(const char *name, int hash_size, int tdb1_flags,
-		      int open_flags, mode_t mode)
-{
-	return tdb1_open_ex(name, hash_size, tdb1_flags, open_flags, mode, NULL, NULL);
-}
+struct tdb1_logging_context {
+        tdb1_log_func log_fn;
+        void *log_private;
+};
 
 static bool hash_correct(struct tdb_context *tdb,
 			 uint32_t *m1, uint32_t *m2)
@@ -137,7 +129,7 @@ static bool check_header_hash(struct tdb_context *tdb,
 	return hash_correct(tdb, m1, m2);
 }
 
-struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags,
+static struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags,
 				int open_flags, mode_t mode,
 				const struct tdb1_logging_context *log_ctx,
 				tdb1_hash_func hash_fn)
@@ -366,6 +358,34 @@ struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags
 	}
 }
 
+/* Temporart wrapper for transition. */
+struct tdb_context *tdb1_open(const char *name, int hash_size, int tdb1_flags,
+			      int open_flags, mode_t mode,
+			      union tdb_attribute *attr)
+{
+	struct tdb1_logging_context *log_ctx = NULL, log;
+	tdb1_hash_func hash_fn = NULL;
+
+	while (attr) {
+		switch (attr->base.attr) {
+		case TDB_ATTRIBUTE_HASH:
+			hash_fn = attr->hash.fn;
+			break;
+		case TDB_ATTRIBUTE_LOG:
+			log.log_fn = attr->log.fn;
+			log.log_private = attr->log.data;
+			log_ctx = &log;
+			break;
+		default:
+			abort();
+		}
+		attr = attr->base.next;
+	}
+
+	return tdb1_open_ex(name, hash_size, tdb1_flags, open_flags, mode,
+			    log_ctx, hash_fn);
+}
+
 /*
  * Set the maximum number of dead records per hash chain
  */