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;
}
hsize.base.next = &tap_log_attr;
hsize.tdb1_hashsize.hsize = 1024;
- plan_tests(41);
+ plan_tests(40);
tdb = tdb_open("run-no-lock-during-traverse.tdb1",
TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR,
0600, &hsize);
ok1(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
- ok1(tdb1_lockall(tdb) == 0);
+ ok1(tdb_lockall(tdb) == 0);
ok1(locking_errors1 == 0);
- tdb1_traverse(tdb, delete_other, &errors);
+ ok1(tdb_traverse(tdb, delete_other, &errors) >= 0);
ok1(errors == 0);
ok1(locking_errors1 == 0);
- ok1(tdb1_unlockall(tdb) == 0);
+ tdb_unlockall(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
- ok1(tdb1_lockall(tdb) == 0);
+ ok1(tdb_lockall(tdb) == 0);
ok1(locking_errors1 == 0);
- tdb1_traverse(tdb, delete_self, NULL);
+ ok1(tdb_traverse(tdb, delete_self, NULL) == NUM_ENTRIES);
ok1(locking_errors1 == 0);
- ok1(tdb1_unlockall(tdb) == 0);
+ tdb_unlockall(tdb);
ok1(prepare_entries(tdb));
ok1(locking_errors1 == 0);
- ok1(tdb1_lockall(tdb) == 0);
+ ok1(tdb_lockall(tdb) == 0);
ok1(locking_errors1 == 0);
delete_entries(tdb);
ok1(locking_errors1 == 0);
- ok1(tdb1_unlockall(tdb) == 0);
+ tdb_unlockall(tdb);
ok1(tdb_close(tdb) == 0);