From nobody Sat Feb 21 17:29:10 2026 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 4fJDcq1fltz6SxQX for ; Sat, 21 Feb 2026 17:29:15 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fJDcq16Vkz40XZ for ; Sat, 21 Feb 2026 17:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694955; 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=Vy5ZCzLc8jW/V63MIw2vhruAeO+nnW/1fPsa0Ym+KPA=; b=dMI3nh4QOcerVwNQSe0rVXEtSFVd1JEkaGkJ6Xl9rYRWxDzCTx7bUG4Vu4rgY43+5+969N JICyE8/nmGS5PSXM36//uEGMS7U/0buUoAPwgdWtInMTGvn/l/mprs0bXUq8juUaLNenK7 5+8r+M3Fxyw74quvg2gpa8gdcppzNmgqW224H1ASQvFSRenvSz14UntRSz2XAkSws0Dmtn 4WIL0/5Bn7Dk6We/ymaxBhsQbsCrYr4UmA9IN2j2t21l4igorCOK344IwGbQq88dDvtF6w Q3SM2VYtKku+D0FUgKRvEbK1hpbOFaFLSbbgGbBGa+mZzNEP9D9whtBrM1Ixvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771694955; a=rsa-sha256; cv=none; b=ltPMT5ob4GsCAjnZfFs9NUSXevAEHg9YwHdJD5/h7iE8xFaglF3D94pEYpj1Ujnyg5NGCP yqKJgZ6MFfo9wMbYpxiqwf/sKjgX1m3ZiwiZTNFYAsxTLraj5/s3hxAaHS0EoCP42DBq0D iIvtwsfiNxETq4Si5zge7U4YYu0tJNOgjNHPuzxoW4ZEwc4qxY6ISQxJiDeAGpF1Pqn9xo YwqtFuIRgSSOUuC54q/dQ8wiTPaKm3QuoTXZ9PrfCjZ2FHNsoDOUOHiaFu1ytiThEAd/vH a1XHRPekhvFx4pY8hPJUnP1WVyh+NnFWOQA2qcasrwDvkZii8vlQxODtihfOlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694955; 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=Vy5ZCzLc8jW/V63MIw2vhruAeO+nnW/1fPsa0Ym+KPA=; b=tm+O5syp83sx4fk7JZ6NgTiju/ut8VsXwSjdpoMcOPlHSEUYyFfrepzonx79QPFYmrDpMu RZ5n8xhbRhztIuRoZBpC3jnbIWwLOEzQ9vQubIU36cZDBs5ypUVML+vsYl+a4aHa7cJIhC H2DS0aEAT6Yx2BjZqhvYJCQoNhIVzLZdsX82dAkVQI2ymEg5taPIiGnN4fTyOLC0+sQV3C ZZNHfXvSEXdcZTg4M0vh2dnBsnKD/+hFzlaFUbuTMsVsrVPFRef5YDWwivhblUL5W49cpG WJIMwWE076Wb2+PEcZgG5nLW4+WvWda8MJyLSOmqQvuegJ9jjR7DgSUp/Hs1Yg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJDcq0k30z1MxF for ; Sat, 21 Feb 2026 17:29:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 39905 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 21 Feb 2026 17:29:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: be10d6fac6d8 - stable/13 - diff: Fix gcc build. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: be10d6fac6d8366123a7ec25ba3826c045027dc6 Auto-Submitted: auto-generated Date: Sat, 21 Feb 2026 17:29:10 +0000 Message-Id: <6999eb66.39905.1ad097d4@gitrepo.freebsd.org> The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=be10d6fac6d8366123a7ec25ba3826c045027dc6 commit be10d6fac6d8366123a7ec25ba3826c045027dc6 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 15:30:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-21 17:29:06 +0000 diff: Fix gcc build. Sponsored by: Klara, Inc. (cherry picked from commit 28d9586cde8dc783f7b698b10c2b564fde14ae74) --- usr.bin/diff/diffdir.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/diff/diffdir.c b/usr.bin/diff/diffdir.c index 6d71d0eeada5..25930c461846 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -61,8 +61,8 @@ RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp); static int vscandir(struct inodetree *tree, struct inode **inop, const char *path, struct dirent ***dirp, - int (*select)(const struct dirent *), - int (*compar)(const struct dirent **, const struct dirent **)) + int (*selectf)(const struct dirent *), + int (*comparf)(const struct dirent **, const struct dirent **)) { struct stat sb; struct inode *ino = NULL; @@ -81,7 +81,7 @@ vscandir(struct inodetree *tree, struct inode **inop, *dirp = NULL; return (0); } - if ((ret = scandir(path, dirp, select, compar)) < 0) + if ((ret = scandir(path, dirp, selectf, comparf)) < 0) goto fail; RB_INSERT(inodetree, tree, ino); close(fd);