]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
c++: don't use strchrnul [PR107781]
authorJason Merrill <jason@redhat.com>
Mon, 21 Nov 2022 22:42:14 +0000 (17:42 -0500)
committerJason Merrill <jason@redhat.com>
Tue, 22 Nov 2022 14:27:02 +0000 (09:27 -0500)
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

index f3afcc62ba0d9057857ad5290c4c9ab338e559d3..a90970167686ba8461be3a6c794da44a4be1203c 100644 (file)
@@ -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;