From: Gary Lockyer <gary@catalyst.net.nz>
Date: Fri, 7 Jun 2019 02:57:19 +0000 (+1200)
Subject: lib ldb ldb_key_value: csbuild unused parm ldb
X-Git-Tag: ldb-2.0.5~385
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c20ca0debe68724b1f0a252e274737a24ea83136;p=thirdparty%2Fsamba.git

lib ldb ldb_key_value: csbuild unused parm ldb

Fixes csbuild error.

Error: COMPILER_WARNING:
lib/ldb/ldb_key_value/ldb_kv_index.c: scope_hint: In function
‘list_intersect’
lib/ldb/ldb_key_value/ldb_kv_index.c:1275:48: warning: unused parameter
‘ldb’ [-Wunused-parameter]

Signed-off-by: Gary Lockyer <gary@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/lib/ldb/ldb_key_value/ldb_kv_index.c b/lib/ldb/ldb_key_value/ldb_kv_index.c
index 74158c42250..941cbdc8001 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -1273,8 +1273,7 @@ static int ldb_kv_index_dn_leaf(struct ldb_module *module,
   list intersection
   list = list & list2
 */
-static bool list_intersect(struct ldb_context *ldb,
-			   struct ldb_kv_private *ldb_kv,
+static bool list_intersect(struct ldb_kv_private *ldb_kv,
 			   struct dn_list *list,
 			   const struct dn_list *list2)
 {
@@ -1621,7 +1620,7 @@ static int ldb_kv_index_dn_and(struct ldb_module *module,
 			list->dn = list2->dn;
 			list->count = list2->count;
 			found = true;
-		} else if (!list_intersect(ldb, ldb_kv, list, list2)) {
+		} else if (!list_intersect(ldb_kv, list, list2)) {
 			talloc_free(list2);
 			return LDB_ERR_OPERATIONS_ERROR;
 		}
@@ -2453,8 +2452,7 @@ int ldb_kv_search_indexed(struct ldb_kv_context *ac, uint32_t *match_count)
 			 * and falling back to a full DB scan).
 			 */
 			if (ret == LDB_SUCCESS) {
-				if (!list_intersect(ldb,
-						    ldb_kv,
+				if (!list_intersect(ldb_kv,
 						    dn_list,
 						    indexed_search_result)) {
 					talloc_free(indexed_search_result);