From nobody Wed Jan 19 00:32:38 2022 X-Original-To: dev-commits-src-branches@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 C054A19565DF; Wed, 19 Jan 2022 00:32:38 +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 4JdmnL51RMz4jxh; Wed, 19 Jan 2022 00:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642552358; 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=cP27OHoeiTJf5Tj2hMuSDB9kHG9yJ3nH3AwaOypIjRQ=; b=t52BS7Hh4mqCo3bb7FXMtGtI1RO/1ayUIoau0JngWyN3VQQZLlRQ2YFuSgK2UUQ/iNNWwW 5EhaKfXD5bF8rxIFg+PrQreANqyjBD9qHm7CF/YfNwJ4DLNi+ksqW8/EWkh0tThw0leqds TGkayF6CD3znVEX8Or94oMseHXdPuFDfPXSqW+MF1va8s3aF0WHFXMLEhHwRziWXmhVB33 BLpuS7hdWAmNB5L4zU3tMP/F+F26S6ZzDZJb98rSMz38NS4+gt8jGdmDs2wWpcrLNam1QQ 0IGVqJ0eeEposJQkfTddHPsFpyOvGHXb5CgW5EvHXKSZDrM6WtyORkneXKXBIA== 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 8C8433325; Wed, 19 Jan 2022 00:32:38 +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 20J0WcI5002507; Wed, 19 Jan 2022 00:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20J0WcaH002506; Wed, 19 Jan 2022 00:32:38 GMT (envelope-from git) Date: Wed, 19 Jan 2022 00:32:38 GMT Message-Id: <202201190032.20J0WcaH002506@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: e475c5f6ca27 - stable/13 - libc: fix misleading comment in strstr List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: e475c5f6ca278639821a4668ea2f1e515383efb7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642552358; 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=cP27OHoeiTJf5Tj2hMuSDB9kHG9yJ3nH3AwaOypIjRQ=; b=kQ6F/vzW87/+lUYgb/uUJbtenM04dOH9xSfqoiTPxpaTMN5ZMohuaxOWxKc9Qn+5jtftbm piHYkKZzLXRiegkPa6HVxA5zfLKQ5vw2b16mjGg9oLbKvcQ6mZEwqvmU/7YTEVfVrdAlOU ZppK92vYZsCESOBSSFDuUXQCIbetVOEbGmDtcVH196QSr+n+uBmfVEI5QXSmMC5DrkZfW+ zUbk9XSKc3khpDt00qHlL3F+kjjthV4us7fVwXwuUevjfhu/FgXLqfATXtfiQLvZwXuuE5 7c+uBG84mM5puwdhRzBxU4G/zJckKmAcDYeydvhfVzz7FByS2RvIifpjRtnVSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642552358; a=rsa-sha256; cv=none; b=dEn2yTJp+83xYUqHN1RgYbmKdGrExDxBFu9WYy6J/yse7U9IZGBOs4A+4WTnGQHzDc0+rT FfJhktO79pGrqC9NwSBY41w023ZdtmiiV9Hr1eTygGyyb4eE7h4521AIaL3axMTEr4io4n RM+IbOzVYvn1/JU4218ymoBSAKIAqH211WRIt4AO0BJ64dQrKbUUF3+iFY8vH23lfqXKB1 F1tMjD/8y4AsTeBBb1wFmjq0nvAjrLgiO74Y+iOy+zvfvNB4lR4gbHkLZEgxiIldT/bcAr /WZzqlHY2G7CuBkGgngFUnH5BhrVwfzmvSgu/4V4gcD787TYi7FMk4e6qj02dQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e475c5f6ca278639821a4668ea2f1e515383efb7 commit e475c5f6ca278639821a4668ea2f1e515383efb7 Author: Ed Maste AuthorDate: 2022-01-16 16:50:10 +0000 Commit: Ed Maste CommitDate: 2022-01-19 00:32:29 +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) {