From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 71FFD3858430 for ; Wed, 20 Dec 2023 22:48:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 71FFD3858430 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 71FFD3858430 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703112503; cv=none; b=C3IuRryzm4skidrb9uXGXVonHczY6sTzY99tm5Yu3853IWICoXkX+PvyTzOquDgRMyy+AOaozPpOxk9lAJLphLFHWeg8EuI89X+/31l7wfYUHLka+GpZl8Bf4c71xhVUxnMB0Ua1virn/KclfpH/fhIeMRr1gtqISYPOMKw849g= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703112503; c=relaxed/simple; bh=FqfcRIPvD+9yg8kkdiKaub7k5EsqfhEpAHdJWb7ryIw=; h=DKIM-Signature:MIME-Version:From:Date:Message-ID:Subject:To; b=F9jDuszGXsS2bcinQeW2o8TziLrxAJecgTzV0IZhL2/lYeZyzUBYTPcZB0fHSoc+WFnsXOxjaanxkHlkqIDGDaCobnrrvbzK06RJqkJATM7Af1r0JjqWPodlmw456VaT9lzFp7nTn50hqAiuZypSz83bKVOodc/8oL3rBNKxBQo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703112502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=5r2mUV6oQqxeCF90ebQ/QLoK3niki8ThylIqhiBGAIE=; b=FsjEecHzVbgqD3nj3tf7rVPnEsPVGGxx8jqbUDhevBYzq5USjIZ3nFq8dqbyDQokYlekVg aD27flcAzj5JPIcuJmVd9g/GccUxq1vt+ZxYh++0U3mGQrR8qYodRNfEAZQ6CC+FZVwpex PmFX/gdsdwutqkzs76f0RfBnhWOpjIg= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-424-DQamx1GKNgGiS3T5Lw2vew-1; Wed, 20 Dec 2023 17:48:20 -0500 X-MC-Unique: DQamx1GKNgGiS3T5Lw2vew-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a268540bc61so2683466b.0 for ; Wed, 20 Dec 2023 14:48:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703112499; x=1703717299; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5r2mUV6oQqxeCF90ebQ/QLoK3niki8ThylIqhiBGAIE=; b=BLTOtJoVof91pKDE+7JQ0rhmpH4R5O0MMySNdvoWYOBrQdUFRWh/h8AWRMoH4GsZLE fznAZrcaFDgr4P3yPtV6E3ImhvW9hvz5jFUjFbJZjM5zS0gB9bR4VkGmfiWu5VlG4thi ZH2/6C3Nzu+mKCn3sFwx8CGZh1xX5vd9si1yrlzn8nrlwPxbgMvad3iBYAlifoEnjU75 74TrKGxwD3U2gCjQyCj1U/frIRBoSiJJnwIUekbDWF3SN9xTixolnSGtjePcukMHDSHQ oMUmlwJtV9h9GzeGehd4+Hf0B1Bkrq9OKvRSVLmyj1Q2E3zpuBO5pbZ62yFp3io5WZ8H qOcQ== X-Gm-Message-State: AOJu0YzoIQUbrMZhZD0lsy/xh3zJOPwxwV78c9AGZSWj02AcrsOeiriX OLpZ0cmbFXUDMGxrOaC0yhN3+dkBS6A93qOnkysqQ2h82fBw2X91aVqzPBN1kTrvxityOox9P+u Y1DCoXQbhZBmIumfYeZvc+D8G9J/8EB3Atz+QjKOw4iKw X-Received: by 2002:a17:907:9494:b0:a23:526d:341b with SMTP id dm20-20020a170907949400b00a23526d341bmr7649609ejc.5.1703112498900; Wed, 20 Dec 2023 14:48:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IG1fp2xs+3t/9TtGztBVUFt8Il6xZwY3YL33w/AlVMBehixFnrfS/qPYdN79S5DBcPtRWnki9RRZ1Gimzs4LlM= X-Received: by 2002:a17:907:9494:b0:a23:526d:341b with SMTP id dm20-20020a170907949400b00a23526d341bmr7649586ejc.5.1703112498005; Wed, 20 Dec 2023 14:48:18 -0800 (PST) MIME-Version: 1.0 References: <20231220061054.35685-1-zengxiao@eswincomputing.com> In-Reply-To: <20231220061054.35685-1-zengxiao@eswincomputing.com> From: Jeff Johnston Date: Wed, 20 Dec 2023 17:48:06 -0500 Message-ID: Subject: Re: [PATCH] newlib: libc: Improved the readability of strpbrk with minor optimization To: Xiao Zeng Cc: newlib@sourceware.org, palmer@rivosinc.com, jeffreyalaw@gmail.com, torbjorn.svensson@foss.st.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/alternative; boundary="00000000000074dace060cf8c7c7" X-Spam-Status: No, score=-10.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --00000000000074dace060cf8c7c7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Unless I am missing something, I think the code could be made even simpler to return the pointer when found and return NULL otherwise. index 774db1e..d984745 100644 --- a/newlib/libc/string/strpbrk.c +++ b/newlib/libc/string/strpbrk.c @@ -29,23 +29,16 @@ strpbrk (const char *s1, const char *s2) { const char *c =3D s2; - if (!*s1) - return (char *) NULL; while (*s1) { for (c =3D s2; *c; c++) { if (*s1 =3D=3D *c) - break; + return (char *) s1; } - if (*c) - break; s1++; } - if (*c =3D=3D '\0') - s1 =3D NULL; - - return (char *) s1; + return (char *) NULL; } On Wed, Dec 20, 2023 at 1:12=E2=80=AFAM Xiao Zeng wrote: > Signed-off-by: Xiao Zeng > --- > newlib/libc/string/strpbrk.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c > index 774db1e6d..95e89c20c 100644 > --- a/newlib/libc/string/strpbrk.c > +++ b/newlib/libc/string/strpbrk.c > @@ -37,15 +37,14 @@ strpbrk (const char *s1, > for (c =3D s2; *c; c++) > { > if (*s1 =3D=3D *c) > - break; > + goto end; > } > - if (*c) > - break; > s1++; > } > > if (*c =3D=3D '\0') > s1 =3D NULL; > > +end: > return (char *) s1; > } > -- > 2.17.1 > > --00000000000074dace060cf8c7c7--