From: Volker Lendecke <vl@samba.org>
Date: Wed, 25 Mar 2020 21:25:06 +0000 (+0100)
Subject: lib: Use ARRAY_DEL_ELEMENT in messaging_dispatch_waiters()
X-Git-Tag: ldb-2.2.0~1219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e14156c92b312e339bbdd0689ee6095e88854ad;p=thirdparty%2Fsamba.git

lib: Use ARRAY_DEL_ELEMENT in messaging_dispatch_waiters()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 63d6362e0c9..4e301651117 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -1327,12 +1327,8 @@ static bool messaging_dispatch_waiters(struct messaging_context *msg_ctx,
 			 * to keep the order of waiters, as
 			 * other code may depend on this.
 			 */
-			if (i < msg_ctx->num_waiters - 1) {
-				memmove(&msg_ctx->waiters[i],
-					&msg_ctx->waiters[i+1],
-					sizeof(struct tevent_req *) *
-					    (msg_ctx->num_waiters - i - 1));
-			}
+			ARRAY_DEL_ELEMENT(
+				msg_ctx->waiters, i, msg_ctx->num_waiters);
 			msg_ctx->num_waiters -= 1;
 			continue;
 		}