From nobody Thu Feb 5 15:27:25 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 4f6Lgd3b3nz6QkVM for ; Thu, 05 Feb 2026 15:27:25 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f6Lgd1MQcz3XPf for ; Thu, 05 Feb 2026 15:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770305245; 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=EJUNUe1xP2CN4ym6d0HgaMZUtfA5R13wGiH9gfESX74=; b=A6gaJJEBBhzb+AtVSobO2t5N6AAjLeQV+y6nuIXJi74IpjBG5GuExXajNVC3mwFhSORBbk FFxpk0gpxM41gMjwZsUtFt3JRDvImDayo2VR18mgAyRxLOi5WOc0bxkQxiC/rOy0rJUXIf /m5c4AMblE1rHuuDmLxTe2eWiESyDX1SRu+RYxVlEiIMTgOObloQVVoDUrJwmgNeraWyPa yNx1S4Qkjm6RaalRESPeiUK0EQjE84YvRBEAacL+kywIAz/DLUe6oCzj9Yj6eBREwPxZfl GcNk6EjLv8KRznoFvremVoHQ983Dx3urbmqYnjn3Yg/66wRvGO9/Suh/PWatkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770305245; a=rsa-sha256; cv=none; b=QcdrGa57O3uNOZ0OpmmNgazjUWP72HuAz9K0IZ53yEKlVxcB3xDW9yrqr+1dJO2vcQaVpZ EhPeSVmiQs3D235v0NqUcvKrTKBclaTVFQC5M+c20/kbYuC2x4PSI2IlRo/xdE3/mLdFlk 8g2/zgSaR6+IvImx4YZs0yM0TAe+p/h6MPTUvSFG3cj8yogBtxHVttBerJQtuduJ2ychO/ vkpMvcGt3yhR/4EG+4G5bBLfzRX8h8RxerXktAtp++330I2zGzPyZFYDLKP3HnRNTDROZ6 lyZy5OmAB1Iqeu1zB8/cRZ9XZ7zwmmQllHsojG7N0VPdh1fF0cmg55ktIKZ/+w== 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=1770305245; 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=EJUNUe1xP2CN4ym6d0HgaMZUtfA5R13wGiH9gfESX74=; b=sIJQaNmmZSz/HoCr1VbXwvMvb0VEJp3+GWEW2WHAEUGRrbgFzhbYhGv7SIwt8/lhof1J9V Olv2stAUXoAR4gieWcTKobeSBy4m5dolp06EfR3OTd5yo7EQEO9ippSPSiTXIkmICLny6i uVIIF7rCbYsEQ7yRLXWpyq6GfshmYwUkzgdH/4naytcAMppoWleVhECJFEKMHiuAdDdPkT /6oHhzJxDZTIVkptkpy1HrJ7plI/TaZE4pcqqaBnzb+js6fjqi9gGvOdx90ENWr2brAzMW EerNGM6yVMy8tkfhWPS3LE3EKTtUK4dkD0I2z/d9/0LFEq6zXSdQ7C4zr9bO2w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f6Lgd0g2Yzbdm for ; Thu, 05 Feb 2026 15:27:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1853b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 05 Feb 2026 15:27:25 +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: c7582d56d29f - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: c7582d56d29f072b4b18c90569b596d2b37f6b12 Auto-Submitted: auto-generated Date: Thu, 05 Feb 2026 15:27:25 +0000 Message-Id: <6984b6dd.1853b.603f7257@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c7582d56d29f072b4b18c90569b596d2b37f6b12 commit c7582d56d29f072b4b18c90569b596d2b37f6b12 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 15:30:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2026-02-05 14:47:46 +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 08c2efd119ca..0eb0d07cd347 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -64,8 +64,8 @@ RB_GENERATE_STATIC(inodetree, inode, entry, inodecmp); static int vscandir(struct inodetree *tree, 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; @@ -84,7 +84,7 @@ vscandir(struct inodetree *tree, const char *path, struct dirent ***dirp, *dirp = NULL; return (0); } - if ((ret = fscandir(fd, dirp, select, compar)) < 0) + if ((ret = fscandir(fd, dirp, selectf, comparf)) < 0) goto fail; RB_INSERT(inodetree, tree, ino); close(fd);