From: Volker Lendecke <vl@samba.org>
Date: Thu, 26 Mar 2020 09:41:30 +0000 (+0100)
Subject: vfs_fruit: Use ARRAY_DEL_ELEMENT() in del_fruit_stream()
X-Git-Tag: ldb-2.2.0~1210
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=356fdb0b6596dd150ad24bb58ef76ffb5906f64b;p=thirdparty%2Fsamba.git

vfs_fruit: Use ARRAY_DEL_ELEMENT() in del_fruit_stream()

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

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index 65390a8d177..1d82b47045c 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -404,11 +404,7 @@ static bool del_fruit_stream(TALLOC_CTX *mem_ctx, unsigned int *num_streams,
 	}
 
 	TALLOC_FREE(tmp[i].name);
-	if (*num_streams - 1 > i) {
-		memmove(&tmp[i], &tmp[i+1],
-			(*num_streams - i - 1) * sizeof(struct stream_struct));
-	}
-
+	ARRAY_DEL_ELEMENT(tmp, i, *num_streams);
 	*num_streams -= 1;
 	return true;
 }