tdb2: unify tdb1_parse_record into tdb_parse_record

Switch on the TDB_VERSION1 flag.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit 3352e4e947777d4a90a2dd4f3037e1e494231b25)

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/tdb2/tdb1_io.c b/lib/tdb2/tdb1_io.c
index 70a660cf53..8219e93046 100644
--- a/lib/tdb2/tdb1_io.c
+++ b/lib/tdb2/tdb1_io.c
@@ -435,15 +435,15 @@ unsigned char *tdb1_alloc_read(struct tdb_context *tdb, tdb1_off_t offset, tdb1_
 }
 
 /* Give a piece of tdb data to a parser */
-
-int tdb1_parse_data(struct tdb_context *tdb, TDB_DATA key,
-		   tdb1_off_t offset, tdb1_len_t len,
-		   int (*parser)(TDB_DATA key, TDB_DATA data,
-				 void *private_data),
-		   void *private_data)
+enum TDB_ERROR tdb1_parse_data(struct tdb_context *tdb, TDB_DATA key,
+			       tdb1_off_t offset, tdb1_len_t len,
+			       enum TDB_ERROR (*parser)(TDB_DATA key,
+							TDB_DATA data,
+							void *private_data),
+			       void *private_data)
 {
 	TDB_DATA data;
-	int result;
+	enum TDB_ERROR result;
 
 	data.dsize = len;
 
@@ -453,14 +453,14 @@ int tdb1_parse_data(struct tdb_context *tdb, TDB_DATA key,
 		 * parser directly at the mmap area.
 		 */
 		if (tdb->tdb1.io->tdb1_oob(tdb, offset+len, 0) != 0) {
-			return -1;
+			return tdb->last_error;
 		}
 		data.dptr = offset + (unsigned char *)tdb->file->map_ptr;
 		return parser(key, data, private_data);
 	}
 
 	if (!(data.dptr = tdb1_alloc_read(tdb, offset, len))) {
-		return -1;
+		return tdb->last_error;
 	}
 
 	result = parser(key, data, private_data);