X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_check.c;h=4d71712c473fb465021ca0cd778dc3b9bbdad418;hb=b2555a868e3ee58d1b31f9558e3623d49ed2b2f1;hp=50e71d9783461a67442e99323d111dd208920215;hpb=bbeb528e74c0e234e1f724ac8d54be404cfc6f9a;p=ccan

diff --git a/ccan/tdb2/tdb1_check.c b/ccan/tdb2/tdb1_check.c
index 50e71d97..4d71712c 100644
--- a/ccan/tdb2/tdb1_check.c
+++ b/ccan/tdb2/tdb1_check.c
@@ -236,7 +236,8 @@ static bool tdb1_check_used_record(struct tdb_context *tdb,
 				  tdb1_off_t off,
 				  const struct tdb1_record *rec,
 				  unsigned char **hashes,
-				  int (*check)(TDB_DATA, TDB_DATA, void *),
+				  enum TDB_ERROR (*check)(TDB_DATA, TDB_DATA,
+							  void *),
 				  void *private_data)
 {
 	TDB_DATA key, data;
@@ -270,13 +271,18 @@ static bool tdb1_check_used_record(struct tdb_context *tdb,
 	/* If they supply a check function and this record isn't dead,
 	   get data and feed it. */
 	if (check && rec->magic != TDB1_DEAD_MAGIC) {
+		enum TDB_ERROR ecode;
+
 		data = get_bytes(tdb, off + sizeof(*rec) + rec->key_len,
 				 rec->data_len);
 		if (!data.dptr)
 			goto fail_put_key;
 
-		if (check(key, data, private_data) == -1)
+		ecode = check(key, data, private_data);
+		if (ecode != TDB_SUCCESS) {
+			tdb->last_error = ecode;
 			goto fail_put_data;
+		}
 		put_bytes(tdb, data);
 	}
 
@@ -323,8 +329,8 @@ size_t tdb1_dead_space(struct tdb_context *tdb, tdb1_off_t off)
 }
 
 int tdb1_check(struct tdb_context *tdb,
-	      int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
-	      void *private_data)
+	       enum TDB_ERROR (*check)(TDB_DATA key, TDB_DATA data, void *),
+	       void *private_data)
 {
 	unsigned int h;
 	unsigned char **hashes;
@@ -338,7 +344,7 @@ int tdb1_check(struct tdb_context *tdb,
 	if (tdb->file->allrecord_lock.count != 0) {
 		locked = false;
 	} else {
-		if (tdb1_lockall_read(tdb) == -1)
+		if (tdb_lockall_read(tdb) != TDB_SUCCESS)
 			return -1;
 		locked = true;
 	}
@@ -455,7 +461,7 @@ int tdb1_check(struct tdb_context *tdb,
 
 	free(hashes);
 	if (locked) {
-		tdb1_unlockall_read(tdb);
+		tdb_unlockall_read(tdb);
 	}
 	return 0;
 
@@ -463,7 +469,7 @@ free:
 	free(hashes);
 unlock:
 	if (locked) {
-		tdb1_unlockall_read(tdb);
+		tdb_unlockall_read(tdb);
 	}
 	return -1;
 }