From 6d0218598c3f3c69b8c2fdf40d3f9611885a51af Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 14 Sep 2011 08:04:13 +0930 Subject: tdb2: make tdb1_null static. It's only used in two files, make it static in one and do it manually in the other. Signed-off-by: Rusty Russell (Imported from CCAN commit 8571daf007f03a2888566dbaae8a5849ffba60f3) --- lib/tdb2/tdb1_tdb.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/tdb2/tdb1_tdb.c') diff --git a/lib/tdb2/tdb1_tdb.c b/lib/tdb2/tdb1_tdb.c index 2442d34785..99b83ab72d 100644 --- a/lib/tdb2/tdb1_tdb.c +++ b/lib/tdb2/tdb1_tdb.c @@ -28,8 +28,6 @@ #include "tdb1_private.h" #include -TDB_DATA tdb1_null; - /* non-blocking increment of the tdb sequence number if the tdb has been opened using the TDB_SEQNUM flag @@ -191,8 +189,11 @@ static TDB_DATA _tdb1_fetch(struct tdb_context *tdb, TDB_DATA key) /* find which hash bucket it is in */ hash = tdb_hash(tdb, key.dptr, key.dsize); - if (!(rec_ptr = tdb1_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) - return tdb1_null; + if (!(rec_ptr = tdb1_find_lock_hash(tdb,key,hash,F_RDLCK,&rec))) { + ret.dptr = NULL; + ret.dsize = 0; + return ret; + } ret.dptr = tdb1_alloc_read(tdb, rec_ptr + sizeof(rec) + rec.key_len, rec.data_len); -- cgit