From 17a84d12e2cef7a42c94d0df404f1ec4854fb65c Mon Sep 17 00:00:00 2001 From: Gary Lockyer Date: Fri, 20 Jul 2018 09:14:52 +1200 Subject: [PATCH] lib ldb: rename ltdb_req_spy to ldb_kv_req_spy Rename ltdb_req_spy to ldb_kv_req_spy, as it is key value level and not tdb specific. Signed-off-by: Gary Lockyer Reviewed-by: Andrew Bartlett --- lib/ldb/ldb_tdb/ldb_tdb.c | 6 +++--- lib/ldb/ldb_tdb/ldb_tdb.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c index 1f0f0fca130..339d27418bb 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/lib/ldb/ldb_tdb/ldb_tdb.c @@ -56,7 +56,7 @@ /* prevent memory errors on callbacks */ -struct ltdb_req_spy { +struct ldb_kv_req_spy { struct ldb_kv_context *ctx; }; @@ -2111,7 +2111,7 @@ done: static int ldb_kv_request_destructor(void *ptr) { - struct ltdb_req_spy *spy = talloc_get_type(ptr, struct ltdb_req_spy); + struct ldb_kv_req_spy *spy = talloc_get_type(ptr, struct ldb_kv_req_spy); if (spy->ctx != NULL) { spy->ctx->spy = NULL; @@ -2184,7 +2184,7 @@ static int ldb_kv_handle_request(struct ldb_module *module, /* set a spy so that we do not try to use the request context * if it is freed before ltdb_callback fires */ - ac->spy = talloc(req, struct ltdb_req_spy); + ac->spy = talloc(req, struct ldb_kv_req_spy); if (NULL == ac->spy) { talloc_free(ac); return LDB_ERR_OPERATIONS_ERROR; diff --git a/lib/ldb/ldb_tdb/ldb_tdb.h b/lib/ldb/ldb_tdb/ldb_tdb.h index 5c6cf98b1e4..9a9471e8c91 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/lib/ldb/ldb_tdb/ldb_tdb.h @@ -96,7 +96,7 @@ struct ldb_kv_context { struct ldb_request *req; bool request_terminated; - struct ltdb_req_spy *spy; + struct ldb_kv_req_spy *spy; /* search stuff */ const struct ldb_parse_tree *tree; -- 2.34.1