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 63d6362e0c975c7edad8ed69596e5a0a1d5a8ef1..4e301651117f8461778c9c52964d4f4d7d3a426f 100644 (file)
--- 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;
                }