Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 21 Feb 2026 17:29:10 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: be10d6fac6d8 - stable/13 - diff: Fix gcc build.
Message-ID:  <6999eb66.39905.1ad097d4@gitrepo.freebsd.org>

index | next in thread | raw e-mail

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 <des@FreeBSD.org>
AuthorDate: 2025-06-20 15:30:03 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
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);


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6999eb66.39905.1ad097d4>