git: 57d542cc92dc - stable/15 - libc: Preserve const qualifier on bsearch(3) results in tests
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 22 Sep 2026 19:01:37 UTC
The branch stable/15 has been updated by kfv:
URL: https://cgit.FreeBSD.org/src/commit/?id=57d542cc92dc5a63e1fb1194618172a95c6aaeb3
commit 57d542cc92dc5a63e1fb1194618172a95c6aaeb3
Author: Faraz Vahedi <kfv@FreeBSD.org>
AuthorDate: 2026-09-13 12:25:47 +0000
Commit: Faraz Vahedi <kfv@FreeBSD.org>
CommitDate: 2026-09-22 17:27:25 +0000
libc: Preserve const qualifier on bsearch(3) results in tests
Reviewed by: dteske, fuz
Approved by: dteske (mentor), fuz (mentor)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D59611
(cherry picked from commit 3caa8d2c58b2787e4c4c64d9ac1831dadd7b0b47)
---
lib/libc/tests/stdlib/bsearch_b_test.c | 2 +-
lib/libc/tests/stdlib/bsearch_s_test.c | 2 +-
lib/libc/tests/stdlib/bsearch_test.c | 2 +-
lib/libc/tests/stdlib/test-search.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/libc/tests/stdlib/bsearch_b_test.c b/lib/libc/tests/stdlib/bsearch_b_test.c
index 4c04a723f639..69c7bed070c9 100644
--- a/lib/libc/tests/stdlib/bsearch_b_test.c
+++ b/lib/libc/tests/stdlib/bsearch_b_test.c
@@ -14,7 +14,7 @@
#define THUNK 42
-static void *
+static const void *
do_bsearch_b(const int *key, const int *base, size_t n, void *ctx)
{
int thunk = *(int *)ctx;
diff --git a/lib/libc/tests/stdlib/bsearch_s_test.c b/lib/libc/tests/stdlib/bsearch_s_test.c
index b41343400ba3..4b57cfc59fd0 100644
--- a/lib/libc/tests/stdlib/bsearch_s_test.c
+++ b/lib/libc/tests/stdlib/bsearch_s_test.c
@@ -45,7 +45,7 @@ expect_viol(const void *key, const void *base, rsize_t nmemb, rsize_t size,
ATF_CHECK_EQ(compar_calls, 0);
}
-static void *
+static const void *
do_bsearch_s(const int *key, const int *base, size_t n, void *ctx)
{
return (bsearch_s(key, base, n, sizeof(int), searchhelp_s, ctx));
diff --git a/lib/libc/tests/stdlib/bsearch_test.c b/lib/libc/tests/stdlib/bsearch_test.c
index 6da8096b85a9..11a682386969 100644
--- a/lib/libc/tests/stdlib/bsearch_test.c
+++ b/lib/libc/tests/stdlib/bsearch_test.c
@@ -37,7 +37,7 @@ searchhelp_never(const void *a __unused, const void *b __unused)
return (0);
}
-static void *
+static const void *
do_bsearch(const int *key, const int *base, size_t n, void *ctx __unused)
{
expected_key = key;
diff --git a/lib/libc/tests/stdlib/test-search.h b/lib/libc/tests/stdlib/test-search.h
index 3d805585eaae..d3ab3a619381 100644
--- a/lib/libc/tests/stdlib/test-search.h
+++ b/lib/libc/tests/stdlib/test-search.h
@@ -15,7 +15,7 @@
#define SVEC_LEN 1024
-typedef void *search_int_t(const int *, const int *, size_t, void *);
+typedef const void *search_int_t(const int *, const int *, size_t, void *);
static int
searchhelp(const void *a, const void *b)