We use underscores everywhere else, so be consistent.
void tdb_hash_init(struct tdb_context *tdb)
{
- tdb->hashfn = jenkins_hash;
+ tdb->hash_fn = jenkins_hash;
}
uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len)
{
- return tdb->hashfn(ptr, len, tdb->hash_seed, tdb->hash_data);
+ return tdb->hash_fn(ptr, len, tdb->hash_seed, tdb->hash_data);
}
uint64_t hash_record(struct tdb_context *tdb, tdb_off_t off)
else
newdb.hdr.hash_seed = random_number(tdb);
newdb.hdr.hash_test = TDB_HASH_MAGIC;
- newdb.hdr.hash_test = tdb->hashfn(&newdb.hdr.hash_test,
- sizeof(newdb.hdr.hash_test),
- newdb.hdr.hash_seed,
- tdb->hash_data);
+ newdb.hdr.hash_test = tdb->hash_fn(&newdb.hdr.hash_test,
+ sizeof(newdb.hdr.hash_test),
+ newdb.hdr.hash_seed,
+ tdb->hash_data);
newdb.hdr.recovery = 0;
newdb.hdr.features_used = newdb.hdr.features_offered = TDB_FEATURE_MASK;
newdb.hdr.seqnum = 0;
tdb->name = NULL;
tdb->direct_access = 0;
tdb->flags = tdb_flags;
- tdb->logfn = NULL;
+ tdb->log_fn = NULL;
tdb->transaction = NULL;
tdb->stats = NULL;
tdb->access = NULL;
while (attr) {
switch (attr->base.attr) {
case TDB_ATTRIBUTE_LOG:
- tdb->logfn = attr->log.fn;
+ tdb->log_fn = attr->log.fn;
tdb->log_data = attr->log.data;
break;
case TDB_ATTRIBUTE_HASH:
- tdb->hashfn = attr->hash.fn;
+ tdb->hash_fn = attr->hash.fn;
tdb->hash_data = attr->hash.data;
break;
case TDB_ATTRIBUTE_SEED:
uint32_t flags;
/* Logging function */
- void (*logfn)(struct tdb_context *tdb,
- enum tdb_log_level level,
- void *data,
- const char *message);
+ void (*log_fn)(struct tdb_context *tdb,
+ enum tdb_log_level level,
+ void *data,
+ const char *message);
void *log_data;
/* Hash function. */
- uint64_t (*hashfn)(const void *key, size_t len, uint64_t seed, void *);
+ uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
void *hash_data;
uint64_t hash_seed;
/* tdb_open paths care about errno, so save it. */
int saved_errno = errno;
- if (!tdb->logfn)
+ if (!tdb->log_fn)
return ecode;
va_start(ap, fmt);
va_end(ap);
if (len < 0) {
- tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_data,
- "out of memory formatting message:");
- tdb->logfn(tdb, level, tdb->log_data, fmt);
+ tdb->log_fn(tdb, TDB_LOG_ERROR, tdb->log_data,
+ "out of memory formatting message:");
+ tdb->log_fn(tdb, level, tdb->log_data, fmt);
} else {
- tdb->logfn(tdb, level, tdb->log_data, message);
+ tdb->log_fn(tdb, level, tdb->log_data, message);
free(message);
}
errno = saved_errno;
{
unsigned int i;
struct tdb_used_record rec;
- struct tdb_context tdb = { .logfn = tap_log_fn };
+ struct tdb_context tdb = { .log_fn = tap_log_fn };
plan_tests(64 + 32 + 48*6 + 1);