From nobody Sat Feb 21 17:29:10 2026 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 4fJDck1p97z6SxLH for ; Sat, 21 Feb 2026 17:29:10 +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 4fJDck15GZz401P for ; Sat, 21 Feb 2026 17:29:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771694950; 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=FGTDPXaTFnd4VmQsTeRy6bwLC8xFyyTOz4KX5Kvxw6FmozGfCyFDS0HW6oFbyEQhFzVQS8 Ap31lGauVBLSO+suQwSPEmN9RDXGiVlJkMh0s84cq7exf/plvKXEHNX009GV3yt6zQsCk7 U13tRDdC3HVKWOikYQEIPXGPwKcKsF7sB0DXVfYN4rJWMVpOB3N60zX013oM+Z63VxQdmz ugQt3j6xDBWWvMNF5inFnqkZxEOp21CkwoZSUxpQT5jsv4VmO3vFCjP3MpRL9QQtRoCd/A gjdsL8y+ICP79yAaRFx2Y+ThE2+1G8EwmlV2f4ijwyZzv8SSScNuZu+aO7aZkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771694950; a=rsa-sha256; cv=none; b=WCphIlGoQ58vzh61cXUi6w2C/yh8+zHyjb9Mm+KLfyrkWDH6AOxxyb9aSNMXGiYhJEIAAF E4tdjiv23xUeBntUNomdTv6k1CbKsZMx163N8NingJajkmxK2B22oKQdquapwAH7gWeipV q1JmsGJpea6dAHvzYMLYueYxSbzBQ9q6cYRMGy59xOQv81KO2Elfz8fo6MOI226yXs796v h7NmJcCmMGEtJtzI8PZ53lmK8I16KEr8nHMmsklVkV+0cUNGEyWQ0VS9mGowT5tS3pOkSW Pa3Lfg5W2M/HW4Vfk+hXA7zjRa2/ObVbasfokiKzLJZE+ravJFKMY3Jbos+Ziw== 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=1771694950; 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=MwjYsV/GN8CN00EMzjDGGoSJqFPbinmsxTEIYqKhLsgi2wnf36E+gWOqmDiEZbFpEPhFu4 X3ZBoQvCDE0jQYyhigA3Tkjq5p2JImXW31CDIzVw0gsOqWibdTfD+6iXOEn420OoLaD1cZ T0evjYF4KjaxkKGPrQ2eG90k8t5VOXWqJU9VzmCkXXnPIL8jNTHSGvBoQMnOh9+K6QW2Pz C2glN3eTESXA6petxAYjKJ/1PCp32HB+GwvFBQ4TTFGA+rpy+C4gsDXtmKjhf6tDg5sYil PqZGeotBDDMvwFwq0D0UnS1kfGsPXpTy4Fhbe6anUfIQKwgcipfMjrbaw7uCOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fJDck0YJSz1MxD for ; Sat, 21 Feb 2026 17:29:10 +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: 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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);