X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-incompatible.c;h=46ab5669207b4e02c75fd88fd4afce25e11f04b7;hb=c4ca9f54301c0367;hp=350c78b2b4f12f881fbba41b203eea2d72408d94;hpb=c8c3b3568677e8b0105f84e4ab068c580faf4591;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-incompatible.c b/ccan/tdb2/test/run-tdb1-incompatible.c
index 350c78b2..46ab5669 100644
--- a/ccan/tdb2/test/run-tdb1-incompatible.c
+++ b/ccan/tdb2/test/run-tdb1-incompatible.c
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
 	dumbhash_attr.base.next = &log_attr;
 	dumbhash_attr.hash.fn = tdb1_dumb_hash;
 
-	plan_tests(38 * 2);
+	plan_tests(42 * 2);
 
 	for (flags = 0; flags <= TDB_CONVERT; flags += TDB_CONVERT) {
 		unsigned int rwmagic = TDB1_HASH_RWLOCK_MAGIC;
@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
+		ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS);
 		tdb_close(tdb);
 
 		/* Should not have marked rwlocks field. */
@@ -102,10 +102,10 @@ int main(int argc, char *argv[])
 			       O_RDWR, 0600, &incompat_hash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		d = tdb1_fetch(tdb, d);
+		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. */
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
+		ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS);
 		tdb_close(tdb);
 
 		/* Should have marked rwlocks field. */
@@ -153,10 +153,10 @@ int main(int argc, char *argv[])
 			       O_RDWR, 0600, &jhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		d = tdb1_fetch(tdb, d);
+		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. */
@@ -167,10 +167,10 @@ int main(int argc, char *argv[])
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		d = tdb1_fetch(tdb, d);
+		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 :( */
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
 		ok1(log_count == 0);
 		d.dptr = (void *)"Hello";
 		d.dsize = 5;
-		ok1(tdb1_store(tdb, d, d, TDB_INSERT) == 0);
+		ok1(tdb_store(tdb, d, d, TDB_INSERT) == TDB_SUCCESS);
 		tdb_close(tdb);
 
 		/* FIXME: Should have marked rwlocks field. */
@@ -202,10 +202,10 @@ int main(int argc, char *argv[])
 			       &dumbhash_attr);
 		ok1(tdb);
 		ok1(log_count == 0);
-		d = tdb1_fetch(tdb, d);
+		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);
 	}