From 2fc32658734d7196de5574c8cadeaea913e255e1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 19 Jun 2012 12:43:10 +0930 Subject: [PATCH] lib/util_tdb: depend directly on tdb, not tdb_compat. Simple change, as we get rid of tdb_compat in favour of tdb directly. Signed-off-by: Rusty Russell --- lib/util/util_tdb.c | 8 ++++---- lib/util/wscript_build | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c index 2db505cd994..41c9b50251c 100644 --- a/lib/util/util_tdb.c +++ b/lib/util/util_tdb.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "../lib/tdb_compat/tdb_compat.h" +#include "../lib/tdb/include/tdb.h" #include "../lib/util/util_tdb.h" /* these are little tdb utility functions that are meant to make @@ -117,7 +117,7 @@ int32_t tdb_fetch_int32_byblob(struct tdb_context *tdb, TDB_DATA key) TDB_DATA data; int32_t ret; - data = tdb_fetch_compat(tdb, key); + data = tdb_fetch(tdb, key); if (!data.dptr || data.dsize != sizeof(int32_t)) { SAFE_FREE(data.dptr); return -1; @@ -174,7 +174,7 @@ bool tdb_fetch_uint32_byblob(struct tdb_context *tdb, TDB_DATA key, uint32_t *va { TDB_DATA data; - data = tdb_fetch_compat(tdb, key); + data = tdb_fetch(tdb, key); if (!data.dptr || data.dsize != sizeof(uint32_t)) { SAFE_FREE(data.dptr); return false; @@ -246,7 +246,7 @@ TDB_DATA tdb_fetch_bystring(struct tdb_context *tdb, const char *keystr) { TDB_DATA key = string_term_tdb_data(keystr); - return tdb_fetch_compat(tdb, key); + return tdb_fetch(tdb, key); } /**************************************************************************** diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 1cefe2d642a..92221b94947 100755 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -41,7 +41,7 @@ bld.SAMBA_SUBSYSTEM('UNIX_PRIVS', bld.SAMBA_LIBRARY('util_tdb', source='util_tdb.c', local_include=False, - public_deps='tdb_compat talloc', + public_deps='tdb talloc', private_library=True )