From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Mar 2020 10:08:07 +0000 (+0100)
Subject: ldb: Use ARRAY_DEL_ELEMENT() in ldb_kv_index_del_value()
X-Git-Tag: ldb-2.2.0~1206
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=61a28bceef820970a9a888338873c16af4d7935c;p=thirdparty%2Fsamba.git

ldb: Use ARRAY_DEL_ELEMENT() in ldb_kv_index_del_value()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@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 5a24b074e1c..9be7c5adcbe 100644
--- a/lib/ldb/ldb_key_value/ldb_kv_index.c
+++ b/lib/ldb/ldb_key_value/ldb_kv_index.c
@@ -3266,9 +3266,7 @@ int ldb_kv_index_del_value(struct ldb_module *module,
 	}
 
 	j = (unsigned int) i;
-	if (j != list->count - 1) {
-		memmove(&list->dn[j], &list->dn[j+1], sizeof(list->dn[0])*(list->count - (j+1)));
-	}
+	ARRAY_DEL_ELEMENT(list->dn, j, list->count);
 	list->count--;
 	if (list->count == 0) {
 		talloc_free(list->dn);