X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftdb.h;h=6fd407a970390fdccc46b494a774900b84966369;hp=01ff905ae2af29a8ff4e6e2d4ea7872b4013def5;hb=cc2d609dfca7192305ad477b8c2b52cfdc1aa9be;hpb=c4c5fed020ba44b9930119672a36a1cb33aff090

diff --git a/ccan/tdb/tdb.h b/ccan/tdb/tdb.h
index 01ff905a..6fd407a9 100644
--- a/ccan/tdb/tdb.h
+++ b/ccan/tdb/tdb.h
@@ -66,9 +66,6 @@ enum TDB_ERROR {TDB_SUCCESS=0, TDB_ERR_CORRUPT, TDB_ERR_IO, TDB_ERR_LOCK,
 		TDB_ERR_NOEXIST, TDB_ERR_EINVAL, TDB_ERR_RDONLY,
 		TDB_ERR_NESTING};
 
-/* flags for tdb_summary. Logical or to combine. */
-enum tdb_summary_flags { TDB_SUMMARY_HISTOGRAMS = 1 };
-
 /* debugging uses one of the following levels */
 enum tdb_debug_level {TDB_DEBUG_FATAL = 0, TDB_DEBUG_ERROR, 
 		      TDB_DEBUG_WARNING, TDB_DEBUG_TRACE};
@@ -82,7 +79,7 @@ typedef struct TDB_DATA {
 typedef struct tdb_context TDB_CONTEXT;
 
 typedef int (*tdb_traverse_func)(struct tdb_context *, TDB_DATA, TDB_DATA, void *);
-typedef void (*tdb_log_func)(struct tdb_context *, enum tdb_debug_level, const char *, ...) PRINTF_ATTRIBUTE(3, 4);
+typedef void (*tdb_log_func)(struct tdb_context *, enum tdb_debug_level, const char *, ...) PRINTF_FMT(3, 4);
 typedef unsigned int (*tdb_hash_func)(TDB_DATA *key);
 
 struct tdb_logging_context {
@@ -144,8 +141,8 @@ void tdb_enable_seqnum(struct tdb_context *tdb);
 void tdb_increment_seqnum_nonblock(struct tdb_context *tdb);
 unsigned int tdb_jenkins_hash(TDB_DATA *key);
 int tdb_check(struct tdb_context *tdb,
-	      int (*check)(TDB_DATA key, TDB_DATA data, void *private),
-	      void *private);
+	      int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
+	      void *private_data);
 
 /* Low level locking functions: use with care */
 int tdb_chainlock(struct tdb_context *tdb, TDB_DATA key);
@@ -167,7 +164,7 @@ void tdb_dump_all(struct tdb_context *tdb);
 int tdb_printfreelist(struct tdb_context *tdb);
 int tdb_validate_freelist(struct tdb_context *tdb, int *pnum_entries);
 int tdb_freelist_size(struct tdb_context *tdb);
-char *tdb_summary(struct tdb_context *tdb, enum tdb_summary_flags flags);
+char *tdb_summary(struct tdb_context *tdb);
 
 extern TDB_DATA tdb_null;