From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 27E9A385843A; Tue, 22 Nov 2022 14:30:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 27E9A385843A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669127405; bh=1H0aJf55qj4HL12sVwlIa14z15tzmcekBHAoF+nDf/M=; h=From:To:Subject:Date:From; b=oHzyeWqunPtTNm1MBVTjEB++QUeW1UEy9fMkGcfu75Ght6SoL1wLYgG27EI6Y8jq/ JQB/4wv1H5Q8wjvCq+sEcCn1bMWbplud5Gpq158alwjdyhRI+AFr/6MRXDMjPH7+Y+ SM5AzxvP0XPrLri3zLkaq1NNGbPnop/gikYPTtl4= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4236] c++: don't use strchrnul [PR107781] X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/master X-Git-Oldrev: 4eb3a48698b2ca43967a4e7e7cfc0408192e85b2 X-Git-Newrev: ac5054144bd2248e948842937448eb5f4ce36bfd Message-Id: <20221122143005.27E9A385843A@sourceware.org> Date: Tue, 22 Nov 2022 14:30:05 +0000 (GMT) List-Id: https://gcc.gnu.org/g:ac5054144bd2248e948842937448eb5f4ce36bfd commit r13-4236-gac5054144bd2248e948842937448eb5f4ce36bfd Author: Jason Merrill Date: Mon Nov 21 17:42:14 2022 -0500 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. Diff: --- 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 f3afcc62ba0..a9097016768 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;