From ac5054144bd2248e948842937448eb5f4ce36bfd Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Mon, 21 Nov 2022 17:42:14 -0500 Subject: [PATCH] c++: don't use strchrnul [PR107781] The contracts implementation was using strchrnul, which is a glibc extension, so bootstrap broke on non-glibc targets. Use C89 strcspn instead. PR c++/107781 gcc/cp/ChangeLog: * contracts.cc (role_name_equal): Use strcspn instead of strchrnul. --- gcc/cp/contracts.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/cp/contracts.cc b/gcc/cp/contracts.cc index f3afcc6..a909701 100644 --- a/gcc/cp/contracts.cc +++ b/gcc/cp/contracts.cc @@ -210,8 +210,8 @@ lookup_concrete_semantic (const char *name) static bool role_name_equal (const char *role, const char *name) { - size_t role_len = strchrnul (role, ':') - role; - size_t name_len = strchrnul (name, ':') - name; + size_t role_len = strcspn (role, ":"); + size_t name_len = strcspn (name, ":"); if (role_len != name_len) return false; return strncmp (role, name, role_len) == 0; -- 2.7.4