X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Fhash.c;h=dec7aae554acbd0f21fd10bf44c886ef72aae9ae;hb=06a5b1a852c207a5172922e39d8effab0dd17b91;hp=0fd4774939d0399b9aa1706a3bf4d01b53c69bbd;hpb=bee60dd0ffe0b1b5821061b4384000c4246f2051;p=ccan

diff --git a/ccan/tdb2/hash.c b/ccan/tdb2/hash.c
index 0fd47749..dec7aae5 100644
--- a/ccan/tdb2/hash.c
+++ b/ccan/tdb2/hash.c
@@ -537,7 +537,7 @@ again:
 /* Return 1 if we find something, 0 if not, -1 on error. */
 int next_in_hash(struct tdb_context *tdb, int ltype,
 		 struct traverse_info *tinfo,
-		 TDB_DATA *kbuf, unsigned int *dlen)
+		 TDB_DATA *kbuf, size_t *dlen)
 {
 	const unsigned group_bits = TDB_TOPLEVEL_HASH_BITS-TDB_HASH_GROUP_BITS;
 	tdb_off_t hlock_start, hlock_range, off;
@@ -560,6 +560,14 @@ int next_in_hash(struct tdb_context *tdb, int ltype,
 						  ltype);
 				return -1;
 			}
+			if (rec_magic(&rec) != TDB_MAGIC) {
+				tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv,
+					 "next_in_hash:"
+					 " corrupt record at %llu\n",
+					 (long long)off);
+				return -1;
+			}
+
 			kbuf->dsize = rec_key_length(&rec);
 
 			/* They want data as well? */
@@ -591,7 +599,7 @@ int next_in_hash(struct tdb_context *tdb, int ltype,
 /* Return 1 if we find something, 0 if not, -1 on error. */
 int first_in_hash(struct tdb_context *tdb, int ltype,
 		  struct traverse_info *tinfo,
-		  TDB_DATA *kbuf, unsigned int *dlen)
+		  TDB_DATA *kbuf, size_t *dlen)
 {
 	tinfo->prev = 0;
 	tinfo->toplevel_group = 0;
@@ -602,41 +610,3 @@ int first_in_hash(struct tdb_context *tdb, int ltype,
 
 	return next_in_hash(tdb, ltype, tinfo, kbuf, dlen);
 }
-
-TDB_DATA tdb_firstkey(struct tdb_context *tdb)
-{
-	struct traverse_info tinfo;
-	struct tdb_data k;
-	switch (first_in_hash(tdb, F_RDLCK, &tinfo, &k, NULL)) {
-	case 1:
-		return k;
-	case 0:
-		tdb->ecode = TDB_SUCCESS;
-		/* Fall thru... */
-	default:
-		return tdb_null;
-	}
-}		
-
-/* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
-TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key)
-{
-	struct traverse_info tinfo;
-	struct hash_info h;
-	struct tdb_used_record rec;
-
-	tinfo.prev = find_and_lock(tdb, key, F_RDLCK, &h, &rec, &tinfo);
-	if (unlikely(tinfo.prev == TDB_OFF_ERR))
-		return tdb_null;
-	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
-
-	switch (next_in_hash(tdb, F_RDLCK, &tinfo, &key, NULL)) {
-	case 1:
-		return key;
-	case 0:
-		tdb->ecode = TDB_SUCCESS;
-		/* Fall thru... */
-	default:
-		return tdb_null;
-	}
-}