From nobody Sun Jan 16 16:54:19 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 585F5196BA22; Sun, 16 Jan 2022 16:54:19 +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 4JcLjR1mWgz4fNp; Sun, 16 Jan 2022 16:54:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642352059; 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=1caGA9WyE9Qs6lG2aOhJIw40oAKH2eOcg+9b2DANPhw=; b=icUQd9dL/ZLKHICYbYaGIikEOh/qWrUoaFFwH7TWfU92v+AK6G0Z/HzldsiatcZFqdEp4Q PkO9HzipqLKmS7CDkRApV2fTycv/9XMgGmGtFYQkP/5i/o5MVvlmtMAcHoNZ7uIylC/drb 6Lg7aq1Zth/DuOlk9xKXigjtBxOL06EPz4MCrChXuXrtliQhPxVP7FJDGaai719owNdklX 86b4lltBeqAVl5nAxfhZYwSZjrHO7m0cz8CXtWg1AROP+GioqD0wwqHWsR4zPaaeB1gsTW +9e27KMqwtkvthvUbUJS93VUMiikoPqv4JA4pJXz5mTsV+0iLWt3fRQFncSm/g== 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 1C1741DD45; Sun, 16 Jan 2022 16:54:19 +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 20GGsJxa033681; Sun, 16 Jan 2022 16:54:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20GGsJ3n033680; Sun, 16 Jan 2022 16:54:19 GMT (envelope-from git) Date: Sun, 16 Jan 2022 16:54:19 GMT Message-Id: <202201161654.20GGsJ3n033680@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: c6750f07b43d - main - 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/main X-Git-Reftype: branch X-Git-Commit: c6750f07b43d18d39729570533f4ecb56da286bf Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642352059; 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=1caGA9WyE9Qs6lG2aOhJIw40oAKH2eOcg+9b2DANPhw=; b=hofHNJBQ5c0dfp0bwmYuqUUjixVLV4xe4jcqjl/ILHJqib5DDnMBHSrQo3JsO2PRcCsHYC f324cUiRx7XxhFN+/vGVZX0sfX4rj/cqqIyFXPhqi0QI3Rjc1GkLLDGCOl1l3oVRZ2wYr8 YgCf0kxgL6uBUkcU5DmzEzq84je2siTDHnf9kYr6a8RmPxMCrdrtJdzJDhERH2roRtTF76 zLpSe7SDh7OB37KB53DZnRUmI1QELf4fGGLxTMlIcAOY11igOik20WoR78cB7eQI/gvEJI Gc/o5X+32r9oa4/u50lvBbqT+TYlt7TCrqEACevIHIDvn7rjnLU/mp69tRIK1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642352059; a=rsa-sha256; cv=none; b=nddVB+jS1mG+aNwixCBtfOjeyCUlvnNYf2aWDusNAIbDHijCus+l08KNYcV8s2tMAmi9dD W23ZMAGsrhaSORIuhmj7OHr5DKX86G/NWk8oa/EYyppLojVIukcAr/t6b5yQ19SoD1iP/4 kPg20OH60KFJXJt0MRCaEDdcxT9GWjvxTVWNYYfO+ObRDrvDL8CZHMnRCvqkHLeUPZtlpd l6zf5fiKceV4/STOWXbXAGsnbW4eNpxVHxrdld9VHAZm94ld0GgGQG3SePDxB300TyVFQv IP8mgQtcUYY16SyS+QaLYcZFAIqetSh7yai9Gb8ga9dSMAYbv2BWGk3vzT8WJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=c6750f07b43d18d39729570533f4ecb56da286bf commit c6750f07b43d18d39729570533f4ecb56da286bf Author: Ed Maste AuthorDate: 2022-01-16 16:50:10 +0000 Commit: Ed Maste CommitDate: 2022-01-16 16:52:29 +0000 libc: fix misleading comment in strstr Obtained from: musl c53e9b239418 --- 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) {