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-incompatible.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-incompatible.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-incompatible.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/tdb2/test/run-tdb1-incompatible.c b/lib/tdb2/test/run-tdb1-incompatible.c index e6b2994e20..46ab566920 100644 --- a/lib/tdb2/test/run-tdb1-incompatible.c +++ b/lib/tdb2/test/run-tdb1-incompatible.c @@ -105,7 +105,7 @@ int main(int argc, char *argv[]) ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS); ok1(d.dsize == 5); free(d.dptr); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); log_count = 0; @@ -113,7 +113,7 @@ int main(int argc, char *argv[]) TDB_VERSION1, O_RDONLY, 0, &jhash_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); log_count = 0; @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) TDB_VERSION1, O_RDONLY, 0, &jhash_attr); ok1(tdb); ok1(log_count == 0); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); /* OK, now create with incompatible hash. */ @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS); ok1(d.dsize == 5); free(d.dptr); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); /* Can open by letting it figure it out itself. */ @@ -170,7 +170,7 @@ int main(int argc, char *argv[]) ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS); ok1(d.dsize == 5); free(d.dptr); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); /* FIXME: Not possible with TDB2 :( */ @@ -205,7 +205,7 @@ int main(int argc, char *argv[]) ok1(tdb_fetch(tdb, d, &d) == TDB_SUCCESS); ok1(d.dsize == 5); free(d.dptr); - ok1(tdb1_check(tdb, NULL, NULL) == 0); + ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS); tdb_close(tdb); } |