*magic1_hash = 1;
}
-static void tdb1_context_init(struct tdb_context *tdb)
+static void tdb_context_init(struct tdb_context *tdb,
+ struct tdb_attribute_tdb1_max_dead *max_dead)
{
assert(tdb->flags & TDB_VERSION1);
tdb->tdb1.page_size = 0x2000;
}
- /* FIXME: Used to be 5 for TDB_VOLATILE. */
- tdb->tdb1.max_dead_records = 0;
+ if (max_dead) {
+ tdb->tdb1.max_dead_records = max_dead->max_dead;
+ } else {
+ tdb->tdb1.max_dead_records = 0;
+ }
}
/* initialise a new database */
enum TDB_ERROR tdb1_new_database(struct tdb_context *tdb,
- struct tdb_attribute_tdb1_hashsize *hashsize)
+ struct tdb_attribute_tdb1_hashsize *hashsize,
+ struct tdb_attribute_tdb1_max_dead *max_dead)
{
struct tdb1_header *newdb;
size_t size;
int hash_size = TDB1_DEFAULT_HASH_SIZE;
- enum TDB_ERROR ret = TDB_ERR_IO;
+ enum TDB_ERROR ret;
- tdb1_context_init(tdb);
+ tdb_context_init(tdb, max_dead);
/* Default TDB2 hash becomes default TDB1 hash. */
if (tdb->hash_fn == tdb_jenkins_hash)
/* We make it up in memory, then write it out if not internal */
size = sizeof(struct tdb1_header) + (hash_size+1)*sizeof(tdb1_off_t);
if (!(newdb = (struct tdb1_header *)calloc(size, 1))) {
- return TDB_ERR_OOM;
+ return tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR,
+ "Could not allocate new database header");
}
/* Fill in the header */
tdb->file->map_ptr = (char *)newdb;
return TDB_SUCCESS;
}
- if (lseek(tdb->file->fd, 0, SEEK_SET) == -1)
+ if (lseek(tdb->file->fd, 0, SEEK_SET) == -1) {
+ ret = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_new_database: lseek failed");
goto fail;
+ }
- if (ftruncate(tdb->file->fd, 0) == -1)
+ if (ftruncate(tdb->file->fd, 0) == -1) {
+ ret = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_new_database: ftruncate failed");
goto fail;
+ }
- /* we still have "ret == TDB_ERR_IO" here */
- if (tdb1_write_all(tdb->file->fd, newdb, size))
- ret = TDB_SUCCESS;
+ if (!tdb1_write_all(tdb->file->fd, newdb, size)) {
+ ret = tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR,
+ "tdb1_new_database: write failed");
+ goto fail;
+ }
+ ret = TDB_SUCCESS;
fail:
SAFE_FREE(newdb);
}
/* We are hold the TDB open lock on tdb->fd. */
-enum TDB_ERROR tdb1_open(struct tdb_context *tdb)
+enum TDB_ERROR tdb1_open(struct tdb_context *tdb,
+ struct tdb_attribute_tdb1_max_dead *max_dead)
{
const char *hash_alg;
uint32_t magic1, magic2;
tdb->flags |= TDB_VERSION1;
- tdb1_context_init(tdb);
+ tdb_context_init(tdb, max_dead);
/* Default TDB2 hash becomes default TDB1 hash. */
if (tdb->hash_fn == tdb_jenkins_hash) {
}
return TDB_SUCCESS;
}
-
-/*
- * Set the maximum number of dead records per hash chain
- */
-
-void tdb1_set_max_dead(struct tdb_context *tdb, int max_dead)
-{
- tdb->tdb1.max_dead_records = max_dead;
-}