X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=79ccd0f1c260cb476b35c146f15a9438f843a673;hp=02642f58c97427b27a03e9bd8c7bd0c17d087328;hb=6fdff621a98f161701f79b3da64e461feaa21952;hpb=efdf0f2d8f34b4c01c82c558b350ec36c7329b1e

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 02642f58..79ccd0f1 100644
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -2,9 +2,6 @@
 #include <ccan/asprintf/asprintf.h>
 #include <stdarg.h>
 
-/* The null return. */
-struct tdb_data tdb_null = { .dptr = NULL, .dsize = 0 };
-
 static enum TDB_ERROR update_rec_hdr(struct tdb_context *tdb,
 				     tdb_off_t off,
 				     tdb_len_t keylen,
@@ -243,6 +240,21 @@ enum TDB_ERROR tdb_fetch(struct tdb_context *tdb, struct tdb_data key,
 	return ecode;
 }
 
+bool tdb_exists(struct tdb_context *tdb, TDB_DATA key)
+{
+	tdb_off_t off;
+	struct tdb_used_record rec;
+	struct hash_info h;
+
+	off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
+	if (TDB_OFF_IS_ERR(off)) {
+		return false;
+	}
+	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
+
+	return off ? true : false;
+}
+
 enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key)
 {
 	tdb_off_t off;
@@ -296,7 +308,7 @@ void tdb_add_flag(struct tdb_context *tdb, unsigned flag)
 		break;
 	case TDB_NOMMAP:
 		tdb->flags |= TDB_NOMMAP;
-		tdb_munmap(tdb);
+		tdb_munmap(tdb->file);
 		break;
 	case TDB_NOSYNC:
 		tdb->flags |= TDB_NOSYNC;
@@ -377,3 +389,51 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
 	errno = saved_errno;
 	return ecode;
 }
+
+enum TDB_ERROR tdb_parse_record_(struct tdb_context *tdb,
+				 TDB_DATA key,
+				 enum TDB_ERROR (*parse)(TDB_DATA key,
+							 TDB_DATA data,
+							 void *p),
+				 void *p)
+{
+	tdb_off_t off;
+	struct tdb_used_record rec;
+	struct hash_info h;
+	TDB_DATA data;
+	enum TDB_ERROR ecode;
+
+	off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
+	if (TDB_OFF_IS_ERR(off)) {
+		return off;
+	}
+
+	if (!off) {
+		ecode = TDB_ERR_NOEXIST;
+	} else {
+		data.dsize = rec_data_length(&rec);
+		data.dptr = (void *)tdb_access_read(tdb,
+						    off + sizeof(rec)
+						    + key.dsize,
+						    data.dsize, false);
+		if (TDB_PTR_IS_ERR(data.dptr)) {
+			ecode = TDB_PTR_ERR(data.dptr);
+		} else {
+			ecode = parse(key, data, p);
+			tdb_access_release(tdb, data.dptr);
+		}
+	}
+
+	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
+	return ecode;
+}
+
+const char *tdb_name(const struct tdb_context *tdb)
+{
+	return tdb->name;
+}
+
+int tdb_fd(const struct tdb_context *tdb)
+{
+	return tdb->file->fd;
+}