tdb2: unify tdb1_store into tdb_store

[ccan] / ccan / tdb2 / tdb1.h

diff --git a/ccan/tdb2/tdb1.h b/ccan/tdb2/tdb1.h
index 78d42b398c50de5d77f07c20c8ca70b5278ac125..e448d75d640e4669557114d1ed85b96b7c6cb888 100644 (file)
--- a/ccan/tdb2/tdb1.h
+++ b/ccan/tdb2/tdb1.h
@@ -37,23 +37,6 @@
 
 
 typedef int (*tdb1_traverse_func)(struct tdb_context *, TDB_DATA, TDB_DATA, void *);
 
 
 typedef int (*tdb1_traverse_func)(struct tdb_context *, TDB_DATA, TDB_DATA, void *);

-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);
-
-struct tdb1_logging_context {
-        tdb1_log_func log_fn;
-        void *log_private;
-};
-
-struct tdb_context *tdb1_open(const char *name, int hash_size, int tdb1_flags,
-                     int open_flags, mode_t mode);
-
-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);

 
 void tdb1_set_max_dead(struct tdb_context *tdb, int max_dead);
 
 
 void tdb1_set_max_dead(struct tdb_context *tdb, int max_dead);
 


@@ -66,12 +49,8 @@ int tdb1_parse_record(struct tdb_context *tdb, TDB_DATA key,
 
 int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
 
 
 int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
 

-int tdb1_store(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag);
-

 int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf);
 
 int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf);
 

-int tdb1_close(struct tdb_context *tdb);
-

 TDB_DATA tdb1_firstkey(struct tdb_context *tdb);
 
 TDB_DATA tdb1_nextkey(struct tdb_context *tdb, TDB_DATA key);
 TDB_DATA tdb1_firstkey(struct tdb_context *tdb);
 
 TDB_DATA tdb1_nextkey(struct tdb_context *tdb, TDB_DATA key);


@@ -96,12 +75,8 @@ int tdb1_transaction_prepare_commit(struct tdb_context *tdb);
 
 int tdb1_transaction_commit(struct tdb_context *tdb);
 
 
 int tdb1_transaction_commit(struct tdb_context *tdb);
 

-int tdb1_transaction_cancel(struct tdb_context *tdb);
-

 int tdb1_get_seqnum(struct tdb_context *tdb);
 
 int tdb1_get_seqnum(struct tdb_context *tdb);
 

-int tdb1_hash_size(struct tdb_context *tdb);
-

 void tdb1_increment_seqnum_nonblock(struct tdb_context *tdb);
 
 uint64_t tdb1_incompatible_hash(const void *key, size_t len, uint64_t seed, void *);
 void tdb1_increment_seqnum_nonblock(struct tdb_context *tdb);
 
 uint64_t tdb1_incompatible_hash(const void *key, size_t len, uint64_t seed, void *);