X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1.h;h=3869373fbe8b47cdbae4c0d2f4c03fc47f0173c2;hp=8ce5fa9d0777515aede35c4151ff55b4bccf2466;hb=3004f7e89a5978064b4fb29c1027e6d0d39e9418;hpb=1e3138a0ad0c184d2ca49ce7bc47173eb2fe67bd diff --git a/ccan/tdb2/tdb1.h b/ccan/tdb2/tdb1.h index 8ce5fa9d..3869373f 100644 --- a/ccan/tdb2/tdb1.h +++ b/ccan/tdb2/tdb1.h @@ -35,10 +35,6 @@ #include #endif -/** Flags to tdb1_store() */ -#define TDB1_REPLACE 1 /** Unused */ -#define TDB1_INSERT 2 /** Don't overwrite an existing entry */ -#define TDB1_MODIFY 3 /** Don't create an existing entry */ /** Flags for tdb1_open() */ #define TDB1_DEFAULT 0 /** just a readability place holder */ @@ -53,42 +49,14 @@ #define TDB1_VOLATILE 256 /** Activate the per-hashchain freelist, default 5 */ #define TDB1_ALLOW_NESTING 512 /** Allow transactions to nest */ #define TDB1_DISALLOW_NESTING 1024 /** Disallow transactions to nest */ -#define TDB1_INCOMPATIBLE_HASH 2048 /** Better hashing: can't be opened by tdb < 1.2.6. */ - -/** The tdb error codes */ -enum TDB1_ERROR {TDB1_SUCCESS=0, TDB1_ERR_CORRUPT, TDB1_ERR_IO, TDB1_ERR_LOCK, - TDB1_ERR_OOM, TDB1_ERR_EXISTS, TDB1_ERR_NOLOCK, TDB1_ERR_LOCK_TIMEOUT, - TDB1_ERR_NOEXIST, TDB1_ERR_EINVAL, TDB1_ERR_RDONLY, - TDB1_ERR_NESTING}; - -/** Debugging uses one of the following levels */ -enum tdb1_debug_level {TDB1_DEBUG_FATAL = 0, TDB1_DEBUG_ERROR, - TDB1_DEBUG_WARNING, TDB1_DEBUG_TRACE}; - -/** The tdb data structure */ -typedef struct TDB1_DATA { - unsigned char *dptr; - size_t dsize; -} TDB1_DATA; - -#ifndef PRINTF_ATTRIBUTE -#if (__GNUC__ >= 3) -/** Use gcc attribute to check printf fns. a1 is the 1-based index of - * the parameter containing the format, and a2 the index of the first - * argument. Note that some gcc 2.x versions don't handle this - * properly **/ -#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) -#else -#define PRINTF_ATTRIBUTE(a1, a2) -#endif -#endif /** This is the context structure that is returned from a db open. */ typedef struct tdb1_context TDB1_CONTEXT; -typedef int (*tdb1_traverse_func)(struct tdb1_context *, TDB1_DATA, TDB1_DATA, void *); -typedef void (*tdb1_log_func)(struct tdb1_context *, enum tdb1_debug_level, const char *, ...) PRINTF_ATTRIBUTE(3, 4); -typedef unsigned int (*tdb1_hash_func)(TDB1_DATA *key); +typedef int (*tdb1_traverse_func)(struct tdb1_context *, TDB_DATA, TDB_DATA, void *); +typedef void (*tdb1_log_func)(struct tdb1_context *, enum tdb_log_level, enum TDB_ERROR, + const char *, void *); +typedef unsigned int (*tdb1_hash_func)(TDB_DATA *key); struct tdb1_logging_context { tdb1_log_func log_fn; @@ -105,30 +73,30 @@ struct tdb1_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flag void tdb1_set_max_dead(struct tdb1_context *tdb, int max_dead); -TDB1_DATA tdb1_fetch(struct tdb1_context *tdb, TDB1_DATA key); +TDB_DATA tdb1_fetch(struct tdb1_context *tdb, TDB_DATA key); -int tdb1_parse_record(struct tdb1_context *tdb, TDB1_DATA key, - int (*parser)(TDB1_DATA key, TDB1_DATA data, +int tdb1_parse_record(struct tdb1_context *tdb, TDB_DATA key, + int (*parser)(TDB_DATA key, TDB_DATA data, void *private_data), void *private_data); -int tdb1_delete(struct tdb1_context *tdb, TDB1_DATA key); +int tdb1_delete(struct tdb1_context *tdb, TDB_DATA key); -int tdb1_store(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA dbuf, int flag); +int tdb1_store(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA dbuf, int flag); -int tdb1_append(struct tdb1_context *tdb, TDB1_DATA key, TDB1_DATA new_dbuf); +int tdb1_append(struct tdb1_context *tdb, TDB_DATA key, TDB_DATA new_dbuf); int tdb1_close(struct tdb1_context *tdb); -TDB1_DATA tdb1_firstkey(struct tdb1_context *tdb); +TDB_DATA tdb1_firstkey(struct tdb1_context *tdb); -TDB1_DATA tdb1_nextkey(struct tdb1_context *tdb, TDB1_DATA key); +TDB_DATA tdb1_nextkey(struct tdb1_context *tdb, TDB_DATA key); int tdb1_traverse(struct tdb1_context *tdb, tdb1_traverse_func fn, void *private_data); int tdb1_traverse_read(struct tdb1_context *tdb, tdb1_traverse_func fn, void *private_data); -int tdb1_exists(struct tdb1_context *tdb, TDB1_DATA key); +int tdb1_exists(struct tdb1_context *tdb, TDB_DATA key); int tdb1_lockall(struct tdb1_context *tdb); @@ -138,8 +106,6 @@ int tdb1_lockall_read(struct tdb1_context *tdb); int tdb1_unlockall_read(struct tdb1_context *tdb); -tdb1_log_func tdb1_log_fn(struct tdb1_context *tdb); - int tdb1_transaction_start(struct tdb1_context *tdb); int tdb1_transaction_prepare_commit(struct tdb1_context *tdb); @@ -154,19 +120,19 @@ int tdb1_hash_size(struct tdb1_context *tdb); void tdb1_increment_seqnum_nonblock(struct tdb1_context *tdb); -unsigned int tdb1_jenkins_hash(TDB1_DATA *key); +unsigned int tdb1_incompatible_hash(TDB_DATA *key); int tdb1_check(struct tdb1_context *tdb, - int (*check) (TDB1_DATA key, TDB1_DATA data, void *private_data), + int (*check) (TDB_DATA key, TDB_DATA data, void *private_data), void *private_data); /* @} ******************************************************************/ /* Low level locking functions: use with care */ -int tdb1_chainlock(struct tdb1_context *tdb, TDB1_DATA key); -int tdb1_chainunlock(struct tdb1_context *tdb, TDB1_DATA key); -int tdb1_chainlock_read(struct tdb1_context *tdb, TDB1_DATA key); -int tdb1_chainunlock_read(struct tdb1_context *tdb, TDB1_DATA key); +int tdb1_chainlock(struct tdb1_context *tdb, TDB_DATA key); +int tdb1_chainunlock(struct tdb1_context *tdb, TDB_DATA key); +int tdb1_chainlock_read(struct tdb1_context *tdb, TDB_DATA key); +int tdb1_chainunlock_read(struct tdb1_context *tdb, TDB_DATA key); /* wipe and repack */ @@ -176,6 +142,6 @@ int tdb1_repack(struct tdb1_context *tdb); /* Debug functions. Not used in production. */ char *tdb1_summary(struct tdb1_context *tdb); -extern TDB1_DATA tdb1_null; +extern TDB_DATA tdb1_null; #endif /* tdb1.h */