Switch on the TDB_VERSION1 flag.
enum TDB_ERROR tdb1_fetch(struct tdb_context *tdb, TDB_DATA key,
TDB_DATA *data);
int tdb1_append(struct tdb_context *tdb, TDB_DATA key, TDB_DATA new_dbuf);
+int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
/* tdb.c: */
enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
struct hash_info h;
enum TDB_ERROR ecode;
+ if (tdb->flags & TDB_VERSION1) {
+ if (tdb1_delete(tdb, key) == -1)
+ return tdb->last_error;
+ return TDB_SUCCESS;
+ }
+
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
return tdb->last_error = off;
void *private_data),
void *private_data);
-int tdb1_delete(struct tdb_context *tdb, TDB_DATA key);
-
TDB_DATA tdb1_firstkey(struct tdb_context *tdb);
TDB_DATA tdb1_nextkey(struct tdb_context *tdb, TDB_DATA key);
uint32_t hash = tdb_hash(tdb, key.dptr, key.dsize);
int ret;
+ assert(tdb->flags & TDB_VERSION1);
ret = tdb1_delete_hash(tdb, key, hash);
return ret;
}
ok1(tdb1_traverse(tdb, test_traverse, &orig_data) == 1);
/* Delete should work. */
- ok1(tdb1_delete(tdb, key) == 0);
+ ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
ok1(tdb1_traverse(tdb, test_traverse, NULL) == 0);
O_RDWR, 0600, &jhash_attr);
ok1(tdb);
ok1(log_count == 0);
- ok1(tdb1_fetch(tdb, d, &d) == TDB_SUCCESS);
+ ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
ok1(d.dsize == 5);
free(d.dptr);
ok1(tdb1_check(tdb, NULL, NULL) == 0);
&dumbhash_attr);
ok1(tdb);
ok1(log_count == 0);
- ok1(tdb1_fetch(tdb, d, &d) == TDB_SUCCESS);
+ ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS);
ok1(d.dsize == 5);
free(d.dptr);
ok1(tdb1_check(tdb, NULL, NULL) == 0);
ok1(tdb1_transaction_start(tdb) == 0);
ok1(tdb1_transaction_start(tdb) == 0);
- ok1(tdb1_delete(tdb, key) == 0);
+ ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
ok1(tdb1_transaction_commit(tdb) == 0);
ok1(!tdb1_exists(tdb, key));
ok1(tdb1_transaction_cancel(tdb) == 0);
ok1(tdb1_transaction_start(tdb) == 0);
ok1(tdb1_transaction_start(tdb) == 0);
- ok1(tdb1_delete(tdb, key) == 0);
+ ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
ok1(tdb1_transaction_commit(tdb) == 0);
ok1(!tdb1_exists(tdb, key));
ok1(tdb1_transaction_commit(tdb) == 0);
key.dsize = sizeof(i);
key.dptr = (void *)&i;
- ok1(tdb1_delete(tdb, key) == 0);
+ ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
}
}
memcpy(&i, key.dptr, 4);
i = (i + 1) % NUM_ENTRIES;
key.dptr = (void *)&i;
- if (tdb1_delete(tdb, key) != 0)
+ if (tdb_delete(tdb, key) != TDB_SUCCESS)
(*(int *)private_data)++;
return 0;
}
static int delete_self(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
void *private_data)
{
- ok1(tdb1_delete(tdb, key) == 0);
+ ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
return 0;
}