From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 10 Jan 2026 14:53:43 +0000 (+0100)
Subject: regtest: undo changes to str_tester as a workaround for darwin checked functions
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80c17e5e70d00a56bc51d37b47799a0d5f897429;p=thirdparty%2Fvalgrind.git

regtest: undo changes to str_tester as a workaround for darwin checked functions

I had added parens to force the use of the function rarther than a
macro expanding to the _chk version. The _chk functions are now wrapped
so no longer need to keep the workaround.
---

diff --git a/memcheck/tests/str_tester.c b/memcheck/tests/str_tester.c
index d910b6909..1201bbfc2 100644
--- a/memcheck/tests/str_tester.c
+++ b/memcheck/tests/str_tester.c
@@ -979,14 +979,14 @@ static void
 test_memcmp (void)
 {
   it = "memcmp";
-  check((memcmp)("a", "a", 1) == 0, 1);		/* Identity. */
-  check((memcmp)("abc", "abc", 3) == 0, 2);	/* Multicharacter. */
-  check((memcmp)("abcd", "abce", 4) < 0, 3);	/* Honestly unequal. */
-  check((memcmp)("abce", "abcd", 4) > 0, 4);
-  check((memcmp)("alph", "beta", 4) < 0, 5);
-  check((memcmp)("a\203", "a\003", 2) > 0, 6);
-  check((memcmp)("abce", "abcd", 3) == 0, 7);	/* Count limited. */
-  check((memcmp)("abc", "def", 0) == 0, 8);	/* Zero count. */
+  check(memcmp("a", "a", 1) == 0, 1);		/* Identity. */
+  check(memcmp("abc", "abc", 3) == 0, 2);	/* Multicharacter. */
+  check(memcmp("abcd", "abce", 4) < 0, 3);	/* Honestly unequal. */
+  check(memcmp("abce", "abcd", 4) > 0, 4);
+  check(memcmp("alph", "beta", 4) < 0, 5);
+  check(memcmp("a\203", "a\003", 2) > 0, 6);
+  check(memcmp("abce", "abcd", 3) == 0, 7);	/* Count limited. */
+  check(memcmp("abc", "def", 0) == 0, 8);	/* Zero count. */
 }
 
 static void