From e8aa764ea7dffbb499882f6bdf986322cd17c20d Mon Sep 17 00:00:00 2001 From: Gary Lockyer Date: Fri, 20 Jul 2018 08:52:48 +1200 Subject: [PATCH] lib ldb: rename struct ltdb_reindex_context Rename struct ltdb_reindex_context to ldb_kv_reindex_context, as this is a key value level structure and not a tdb specific structure. Signed-off-by: Gary Lockyer Reviewed-by: Andrew Bartlett --- lib/ldb/ldb_tdb/ldb_index.c | 6 +++--- lib/ldb/ldb_tdb/ldb_tdb.c | 2 +- lib/ldb/ldb_tdb/ldb_tdb.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c index 23b8aa005cb..4d6c57b3a84 100644 --- a/lib/ldb/ldb_tdb/ldb_index.c +++ b/lib/ldb/ldb_tdb/ldb_index.c @@ -2832,7 +2832,7 @@ static int delete_index(struct ltdb_private *ltdb, struct ldb_val key, struct ld static int re_key(struct ltdb_private *ltdb, struct ldb_val ldb_key, struct ldb_val val, void *state) { struct ldb_context *ldb; - struct ltdb_reindex_context *ctx = (struct ltdb_reindex_context *)state; + struct ldb_kv_reindex_context *ctx = (struct ldb_kv_reindex_context *)state; struct ldb_module *module = ctx->module; struct ldb_message *msg; unsigned int nb_elements_in_db; @@ -2923,7 +2923,7 @@ static int re_key(struct ltdb_private *ltdb, struct ldb_val ldb_key, struct ldb_ static int re_index(struct ltdb_private *ltdb, struct ldb_val ldb_key, struct ldb_val val, void *state) { struct ldb_context *ldb; - struct ltdb_reindex_context *ctx = (struct ltdb_reindex_context *)state; + struct ldb_kv_reindex_context *ctx = (struct ldb_kv_reindex_context *)state; struct ldb_module *module = ctx->module; struct ldb_message *msg; unsigned int nb_elements_in_db; @@ -3010,7 +3010,7 @@ int ldb_kv_reindex(struct ldb_module *module) { struct ltdb_private *ltdb = talloc_get_type(ldb_module_get_private(module), struct ltdb_private); int ret; - struct ltdb_reindex_context ctx; + struct ldb_kv_reindex_context ctx; /* * Only triggered after a modification, but make clear we do diff --git a/lib/ldb/ldb_tdb/ldb_tdb.c b/lib/ldb/ldb_tdb/ldb_tdb.c index c0938c0824c..348b5fceb02 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/lib/ldb/ldb_tdb/ldb_tdb.c @@ -1924,7 +1924,7 @@ static int ltdb_update_in_iterate(struct ltdb_private *ltdb, { int tdb_ret; struct ldb_context *ldb; - struct ltdb_reindex_context *ctx = (struct ltdb_reindex_context *)state; + struct ldb_kv_reindex_context *ctx = (struct ldb_kv_reindex_context *)state; struct ldb_module *module = ctx->module; TDB_DATA key = { .dptr = ldb_key.data, diff --git a/lib/ldb/ldb_tdb/ldb_tdb.h b/lib/ldb/ldb_tdb/ldb_tdb.h index 861d94a124f..d7f6073a33d 100644 --- a/lib/ldb/ldb_tdb/ldb_tdb.h +++ b/lib/ldb/ldb_tdb/ldb_tdb.h @@ -109,7 +109,7 @@ struct ltdb_context { int error; }; -struct ltdb_reindex_context { +struct ldb_kv_reindex_context { struct ldb_module *module; int error; uint32_t count; -- 2.34.1