diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:59:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:59:13 +0930 |
| commit | 8e14a3e06d42b0302868dc3911a2e607e42a51b3 (patch) | |
| tree | ada1f4891472e6a4d3904327fb7f6bc0264f915c /lib/tdb2/test/run-tdb1-check.c | |
| parent | 5d9dd8d541a761e0af2c8d50ee55485f2cef3e01 (diff) | |
| download | samba-8e14a3e06d42b0302868dc3911a2e607e42a51b3.tar.gz samba-8e14a3e06d42b0302868dc3911a2e607e42a51b3.tar.bz2 samba-8e14a3e06d42b0302868dc3911a2e607e42a51b3.zip | |
tdb2: unify tdb1_check and tdb1_summary into tdb_check and tdb_summary.
Switch on the TDB_VERSION1 flag. Also, change tdb1_check's checkfn argument
to return an error code (and set tdb->last_error accordingly).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit ef92843f2c74ab9d4fa7f167a2182e5e8955df91)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-check.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-check.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/tdb2/test/run-tdb1-check.c b/lib/tdb2/test/run-tdb1-check.c index d2360f02fd..e939d04036 100644 --- a/lib/tdb2/test/run-tdb1-check.c +++ b/lib/tdb2/test/run-tdb1-check.c @@ -19,7 +19,7 @@ int main(int argc, char *argv[]) O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); ok1(tdb); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); key.dsize = strlen("hi"); key.dptr = (void *)"hi"; @@ -27,18 +27,18 @@ int main(int argc, char *argv[]) data.dptr = (void *)"world"; ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); tdb = tdb_open("run-check.tdb1", TDB_VERSION1, O_RDWR, 0, &tap_log_attr); ok1(tdb); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); tdb = tdb_open("test/tdb1.corrupt", TDB_VERSION1, O_RDWR, 0, &tap_log_attr); ok1(tdb); - ok1(tdb1_check(tdb, NULL, NULL) == -1); + ok1(tdb_check(tdb, NULL, NULL) == TDB_ERR_CORRUPT); ok1(tdb_error(tdb) == TDB_ERR_CORRUPT); tdb_close(tdb); @@ -46,13 +46,13 @@ int main(int argc, char *argv[]) tdb = tdb_open("test/old-nohash-le.tdb1", TDB_VERSION1, O_RDWR, 0, &tap_log_attr); ok1(tdb); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); tdb = tdb_open("test/old-nohash-be.tdb1", TDB_VERSION1, O_RDWR, 0, &tap_log_attr); ok1(tdb); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); return exit_status(); |