From nobody Wed Jan 19 00:33:08 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 857CA1956F22; Wed, 19 Jan 2022 00:33:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jdmnw6GxKz4k3g; Wed, 19 Jan 2022 00:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642552389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+bCy3WvFUwhVYFDESieqZsx0jghxMVXDFMrlV1OGCc=; b=dlJDtY9St1+ikjj0mG1KtKto3U2WqbR+pnW53FfusZeLdAwhroP00+DqidvSUwCl3ZY5uD c6cAUbUCBrsCxoW8OwuOZfcjTC0WVAIJpaTo8JyS8nCVfNRROcZEQFpecAW+ro5Ps/2SEq 6obfU8mNt30Q1r2bdvoeTTxM+gJeJ+igiM1zoPxsYmUpC+RZgF4YWOyDidPYpSf8+do6J1 ytoYsTDEJWBbAgwKkNIiogei+zBBUZ5qF8e2sZi91kr8PPDYEIo+Y28Hi7ZfhU4TW3ljyW knpVhwBM9Vyfpe/dXSHw6z6Tu8km6m5bSbVPumN52pmbn1104S60GqMELO3UvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 872273326; Wed, 19 Jan 2022 00:33:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20J0X8Dj002732; Wed, 19 Jan 2022 00:33:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20J0X8Ts002731; Wed, 19 Jan 2022 00:33:08 GMT (envelope-from git) Date: Wed, 19 Jan 2022 00:33:08 GMT Message-Id: <202201190033.20J0X8Ts002731@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: d38fec19012a - stable/12 - libc: fix misleading comment in strstr List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d38fec19012a84838566bb9f6398f89d1801f104 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642552389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E+bCy3WvFUwhVYFDESieqZsx0jghxMVXDFMrlV1OGCc=; b=b1PhBwSf7BNAMA0odMcTZI9m8oKEKD1uJJN5adYYCTje2P0+wceAD+GpMpTz3Bi+crhLzx RUbfoS97mduVhMzFDOqkgsBpTSAvkgoSAq0W4++AUxyfnhx7JAhMTQ177LRqt7n4etnEdW Pa4aBDlX45cLE3dgBR4rJr4TzpFrCke2TQiutQpz3qp9bKLO1fuJaglmyR/1+U0esBvUhC z0IGeF3MKxHoPXXvnPaLZ4sLmJLVm7lrfGZTgfZfg/l2Vhyi4ZQBVCva9K50gUJwU2wQDX 70XLBubwGYtnF4ZFmjdYYThgL82Nk1LWfbrhJjPjRBTobCL5rw2HnflqEq2nmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642552389; a=rsa-sha256; cv=none; b=fM+Ara1t4KWPioXiljRNMzaTK2Krff1MYwGUbeDFRipu+89SVQGnN2AzzqA36PdaXbH5Vl voo6NKxEMnfIHluJ7PJnsGE+pZUnbKOfil2hvmm0r9WYfDBkQLNmD5tvtgkAIxbV50XmMv poPnYTwpGGCsVK91k+6cgzuvvkemavRd44NmxAB9R8LL7eN55BBP1lOxWrxXZh8wXsxj99 +YUbqdhyW/O8JqnpmvZrG6ZvQ44BvUhks0lFEWWqI1FrKPS/gSDBRoHTgYDUcVPa4+Egrn aVtoWa8rVqcjBPzDBnh1QQgMCn7kV+9cio65LTQpSncYWJA5IMWutygCe3mRDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d38fec19012a84838566bb9f6398f89d1801f104 commit d38fec19012a84838566bb9f6398f89d1801f104 Author: Ed Maste AuthorDate: 2022-01-16 16:50:10 +0000 Commit: Ed Maste CommitDate: 2022-01-19 00:32:50 +0000 libc: fix misleading comment in strstr Obtained from: musl c53e9b239418 (cherry picked from commit c6750f07b43d18d39729570533f4ecb56da286bf) --- lib/libc/string/strstr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libc/string/strstr.c b/lib/libc/string/strstr.c index 72f8abb9e200..ce06db11f161 100644 --- a/lib/libc/string/strstr.c +++ b/lib/libc/string/strstr.c @@ -149,7 +149,7 @@ twoway_strstr(const unsigned char *h, const unsigned char *n) for (;;) { /* Update incremental end-of-haystack pointer */ if (z - h < l) { - /* Fast estimate for MIN(l,63) */ + /* Fast estimate for MAX(l,63) */ size_t grow = l | 63; const unsigned char *z2 = memchr(z, 0, grow); if (z2) {