#include <stdint.h>
#endif
#include <ccan/compiler/compiler.h>
+#include <ccan/typesafe_cb/typesafe_cb.h>
union tdb_attribute;
struct tdb_context;
*/
enum TDB_ERROR tdb_transaction_prepare_commit(struct tdb_context *tdb);
-/* FIXME: Make typesafe */
-typedef int (*tdb_traverse_func)(struct tdb_context *, TDB_DATA, TDB_DATA, void *);
-
/**
* tdb_traverse - traverse a TDB
* @tdb: the tdb context returned from tdb_open()
* On success, returns the number of keys iterated. On error returns
* a negative enum TDB_ERROR value.
*/
-int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p);
+#define tdb_traverse(tdb, fn, p) \
+ tdb_traverse_(tdb, typesafe_cb_preargs(int, (fn), (p), \
+ struct tdb_context *, \
+ TDB_DATA, TDB_DATA), (p))
+
+int64_t tdb_traverse_(struct tdb_context *tdb,
+ int (*fn)(struct tdb_context *,
+ TDB_DATA, TDB_DATA, void *), void *p);
/**
* tdb_firstkey - get the "first" key in a TDB
* tdb_check - check a TDB for consistency
* @tdb: the tdb context returned from tdb_open()
* @check: function to check each key/data pair (or NULL)
- * @private_data: pointer for @check
+ * @private: argument for @check, must match type.
*
* This performs a consistency check of the open database, optionally calling
* a check() function on each record so you can do your own data consistency
* checks as well. If check() returns an error, that is returned from
* tdb_check().
+ *
+ * Returns TDB_SUCCESS or an error.
*/
-enum TDB_ERROR tdb_check(struct tdb_context *tdb,
- enum TDB_ERROR (*check)(TDB_DATA key,
- TDB_DATA data,
- void *private_data),
- void *private_data);
+#define tdb_check(tdb, check, private) \
+ tdb_check_((tdb), typesafe_cb_preargs(enum TDB_ERROR, \
+ (check), (private), \
+ struct tdb_data, \
+ struct tdb_data), \
+ (private))
+
+enum TDB_ERROR tdb_check_(struct tdb_context *tdb,
+ enum TDB_ERROR (*check)(struct tdb_data key,
+ struct tdb_data data,
+ void *private),
+ void *private);
/**
* enum tdb_summary_flags - flags for tdb_summary.