From 6002ea65bc49d3ad17e92297eeeb459ae114d6e5 Mon Sep 17 00:00:00 2001
From: Daniel Lundqvist <daniel@malarhojden.nu>
Date: Sun, 30 Mar 2025 16:09:34 +0200
Subject: [PATCH] Implement StringArrayForEach in terms of ArrayForEach instead
 of duplicating it.

---
 containers/stringarray.c | 2 +-
 containers/stringarray.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/containers/stringarray.c b/containers/stringarray.c
index 3ffed10..79a7a89 100644
--- a/containers/stringarray.c
+++ b/containers/stringarray.c
@@ -32,7 +32,7 @@ VOID StringArrayFree(StringArray array, BOOL freeStrings)
 	{
 		if( freeStrings )
 		{
-			StringArrayForEach(array, FreeVec(aString););
+			StringArrayForEach(array, FreeVec((STRPTR)aString););
 		}
 		DeleteArray(array);
 	}
diff --git a/containers/stringarray.h b/containers/stringarray.h
index 96efe1f..3263f53 100644
--- a/containers/stringarray.h
+++ b/containers/stringarray.h
@@ -14,7 +14,6 @@ CONST_STRPTR* StringArrayValues(StringArray array);
 STRPTR StringArrayJoined(StringArray array, BYTE linkCharacter);
 STRPTR StringArrayJoinedParts(StringArray array, BYTE linkCharacter, ULONG startIndex, ULONG maxParts);
 
-#define StringArrayForEach(array, block) do {STRPTR *afe_123_p = (*(STRPTR **)array); STRPTR aString = *afe_123_p; int afe_123_c = (((ULONG *)array)[1]);\
-  for (; afe_123_c--; aString = *(++afe_123_p)) block} while (0);
+#define StringArrayForEach(array, block) ArrayForEach(CONST_STRPTR, aString, array, block)
 
 #endif
\ No newline at end of file