From 98a4037df4468ccaed69551890fac0b0916048bd Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 12 Mar 2015 14:14:24 +0000 Subject: [PATCH] Remove tdb_[first|next]key_compat This is essentially a revert of 3a8faefd. Signed-off-by: Volker Lendecke Reviewed-by: Michael Adam --- lib/tdb_compat/tdb_compat.h | 8 -------- source3/printing/nt_printing_migrate_internal.c | 10 +++++----- source3/printing/nt_printing_tdb.c | 6 +++--- source3/utils/net_printing.c | 16 ++++++++-------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/lib/tdb_compat/tdb_compat.h b/lib/tdb_compat/tdb_compat.h index ad0194edbfe..cda86f741c0 100644 --- a/lib/tdb_compat/tdb_compat.h +++ b/lib/tdb_compat/tdb_compat.h @@ -29,14 +29,6 @@ #include #include -#define tdb_firstkey_compat tdb_firstkey -/* Note: this frees the old key.dptr. */ -static inline TDB_DATA tdb_nextkey_compat(struct tdb_context *tdb, TDB_DATA k) -{ - TDB_DATA next = tdb_nextkey(tdb, k); - free(k.dptr); - return next; -} #define tdb_errorstr_compat(tdb) tdb_errorstr(tdb) #define tdb_fetch_compat tdb_fetch diff --git a/source3/printing/nt_printing_migrate_internal.c b/source3/printing/nt_printing_migrate_internal.c index bbcce8e4e8a..1765329dca3 100644 --- a/source3/printing/nt_printing_migrate_internal.c +++ b/source3/printing/nt_printing_migrate_internal.c @@ -69,7 +69,7 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx, struct rpc_pipe_client *winreg_pipe) { const char *backup_suffix = ".bak"; - TDB_DATA kbuf, dbuf; + TDB_DATA kbuf, newkey, dbuf; TDB_CONTEXT *tdb; NTSTATUS status; int rc; @@ -86,9 +86,9 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx, return NT_STATUS_NO_SUCH_FILE; } - for (kbuf = tdb_firstkey_compat(tdb); + for (kbuf = tdb_firstkey(tdb); kbuf.dptr; - kbuf = tdb_nextkey_compat(tdb, kbuf)) + newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf = newkey) { dbuf = tdb_fetch_compat(tdb, kbuf); if (!dbuf.dptr) { @@ -143,9 +143,9 @@ static NTSTATUS migrate_internal(TALLOC_CTX *mem_ctx, SAFE_FREE(dbuf.dptr); } - for (kbuf = tdb_firstkey_compat(tdb); + for (kbuf = tdb_firstkey(tdb); kbuf.dptr; - kbuf = tdb_nextkey_compat(tdb, kbuf)) + newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf = newkey) { dbuf = tdb_fetch_compat(tdb, kbuf); if (!dbuf.dptr) { diff --git a/source3/printing/nt_printing_tdb.c b/source3/printing/nt_printing_tdb.c index 953448d497e..f798b955e45 100644 --- a/source3/printing/nt_printing_tdb.c +++ b/source3/printing/nt_printing_tdb.c @@ -88,12 +88,12 @@ static TDB_DATA make_printers_secdesc_tdbkey(TALLOC_CTX *ctx, static bool upgrade_to_version_3(void) { - TDB_DATA kbuf, dbuf; + TDB_DATA kbuf, newkey, dbuf; DEBUG(0,("upgrade_to_version_3: upgrading print tdb's to version 3\n")); - for (kbuf = tdb_firstkey_compat(tdb_drivers); kbuf.dptr; - kbuf = tdb_nextkey_compat(tdb_drivers, kbuf)) { + for (kbuf = tdb_firstkey(tdb_drivers); kbuf.dptr; + newkey = tdb_nextkey(tdb_drivers, kbuf), free(kbuf.dptr), kbuf=newkey) { dbuf = tdb_fetch_compat(tdb_drivers, kbuf); diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c index 4b9ed435b0e..d3dcf516d33 100644 --- a/source3/utils/net_printing.c +++ b/source3/utils/net_printing.c @@ -216,7 +216,7 @@ static int net_printing_dump(struct net_context *c, int argc, int ret = -1; TALLOC_CTX *ctx = talloc_stackframe(); TDB_CONTEXT *tdb; - TDB_DATA kbuf, dbuf; + TDB_DATA kbuf, newkey, dbuf; struct printing_opts *o; const char *save_dos_charset = lp_dos_charset(); bool do_string_conversion = false; @@ -254,9 +254,9 @@ static int net_printing_dump(struct net_context *c, int argc, do_string_conversion = true; } - for (kbuf = tdb_firstkey_compat(tdb); + for (kbuf = tdb_firstkey(tdb); kbuf.dptr; - kbuf = tdb_nextkey_compat(tdb, kbuf)) + newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf=newkey) { dbuf = tdb_fetch_compat(tdb, kbuf); if (!dbuf.dptr) { @@ -317,7 +317,7 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, struct printing_opts *o; TALLOC_CTX *tmp_ctx; TDB_CONTEXT *tdb; - TDB_DATA kbuf, dbuf; + TDB_DATA kbuf, newkey, dbuf; NTSTATUS status; const char *save_dos_charset = lp_dos_charset(); bool do_string_conversion = false; @@ -347,9 +347,9 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, do_string_conversion = true; } - for (kbuf = tdb_firstkey_compat(tdb); + for (kbuf = tdb_firstkey(tdb); kbuf.dptr; - kbuf = tdb_nextkey_compat(tdb, kbuf)) + newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf = newkey) { dbuf = tdb_fetch_compat(tdb, kbuf); if (!dbuf.dptr) { @@ -390,9 +390,9 @@ static NTSTATUS printing_migrate_internal(struct net_context *c, SAFE_FREE(dbuf.dptr); } - for (kbuf = tdb_firstkey_compat(tdb); + for (kbuf = tdb_firstkey(tdb); kbuf.dptr; - kbuf = tdb_nextkey_compat(tdb, kbuf)) + newkey = tdb_nextkey(tdb, kbuf), free(kbuf.dptr), kbuf = newkey) { dbuf = tdb_fetch_compat(tdb, kbuf); if (!dbuf.dptr) { -- 2.11.4.GIT