X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb2.h;h=adaf67106551f695d5b5384300b88e812190080c;hp=5e74bfe7883e48e7f1e52e1b5d1696d1ebc433fe;hb=e2cb71e5d46801a94a3f0f546b8dcc2b7a79b66c;hpb=46d8f62015fb8bf6fe173573a55ea3f6324cee0a diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h index 5e74bfe7..adaf6710 100644 --- a/ccan/tdb2/tdb2.h +++ b/ccan/tdb2/tdb2.h @@ -40,6 +40,7 @@ extern "C" { /* For uint64_t */ #include #endif +#include /* flags to tdb_store() */ #define TDB_REPLACE 1 /* Unused */ @@ -75,18 +76,6 @@ typedef struct tdb_data { size_t dsize; } TDB_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 - struct tdb_context; /* FIXME: Make typesafe */ @@ -97,7 +86,8 @@ typedef uint64_t (*tdb_hashfn_t)(const void *key, size_t len, uint64_t seed, enum tdb_attribute_type { TDB_ATTRIBUTE_LOG = 0, - TDB_ATTRIBUTE_HASH = 1 + TDB_ATTRIBUTE_HASH = 1, + TDB_ATTRIBUTE_SEED = 2 }; struct tdb_attribute_base { @@ -117,10 +107,16 @@ struct tdb_attribute_hash { void *hash_private; }; +struct tdb_attribute_seed { + struct tdb_attribute_base base; /* .attr = TDB_ATTRIBUTE_SEED */ + uint64_t seed; +}; + union tdb_attribute { struct tdb_attribute_base base; struct tdb_attribute_log log; struct tdb_attribute_hash hash; + struct tdb_attribute_seed seed; }; struct tdb_context *tdb_open(const char *name, int tdb_flags,