From nobody Fri Jun 20 15:42:55 2025 X-Original-To: dev-commits-src-main@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 4bP1vg5gJmz5yCBP; Fri, 20 Jun 2025 15:42:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bP1vg1Kb6z3Fdc; Fri, 20 Jun 2025 15:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750434175; 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=VN6qU/7fle5ZjnJKAitFUeOBd8dOxcs9Jm773qmEARY=; b=uy5m+ORB+Ipzna5G9trAALb4EErreskHFi8TU769BDiYPQ2bbH+DE9mSYWI/ao3xOUA/v0 +67ifDyueOXgWQHIwQVl8hGa55lt9FT9pdQqpJEJSR8r1gUGegvODZRnchubNA9KSp1/vB ZDe8qaO21y3uN/xyRGjfdV+2hsxYx2sEWYcMm6tvarruNbXjWWK6FCx2LI8R0spD+m8e01 I7ctqO1mU9uPiwZRQR+WWsxHbKyOGbC2pM7yMja7L3+S3YI4QERmmLGpYXoz8TaDwcCYR/ oWX4LyVDlhXJFcSpLL4P5z/6ePzi8mHJmG1IMwsa7vEd2GVdvS2T0IjXO2Bn7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750434175; 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=VN6qU/7fle5ZjnJKAitFUeOBd8dOxcs9Jm773qmEARY=; b=XILKNjNzA33ykDGTJ54VqNwxkp2/VtEDy4/1FmUJLqMSsVGM50Tj+EYImsLEPi/j2RZ4xm +44FaGdv9XuO8KrfX2TnHQtQH85zo3mwGmIEcalqm8hj1BvOFfENU9G80yiDfB5syZW4bH X3KbUlWU3/wCfEqQCNs96W+slj/yMIS8lH9KNZ5gXaYiSL9wHGVIILMCOP7qQNkPpc5QYm 2lILKsU1CKMZZBeF08P4itOZqJdVC+nkSAI2d4P3pJCPyRN3W2ZATDo0eGOAust2KgL8qq YlIccZFgtk6yqtiOgHlqSyPhzwjEwoMGBnn3ovZiXUR5/3ZR/qjb09sZl2sYgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750434175; a=rsa-sha256; cv=none; b=W4GplZEwfJVWaxQhEm2GDi0oIB7EisZe8XSqSL2jnO/MKvb91yAzZGB6x64bQdP8Rz9Jeb GaI6NXpX9AxEMxUOrglt9XYM+KL1eL/16oxjYguQZzjuGRnfv18SJ1kuDZ07ayG/+Va/YN tLz8VakpiT2uvpv0zNYtUjgUBziM9Djq7CYm3KgTUoZ2D3bBhQCJR8uKFuX+ituy+A73NN jwYVdV9h8ndj0tCEIHg6jG/29/sadlzcK3QWyrbElxHEmDQ+tjyOzayjnsj0Gg+5uRCyuj tDARdIkXF14RV5UXMUIdfLt9o8avhYjegqjHEQ3NjEBgSSI8Gf+DAEMO6DQuQA== 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 4bP1vg0qRvzrsB; Fri, 20 Jun 2025 15:42:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55KFgtIH065808; Fri, 20 Jun 2025 15:42:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55KFgtEW065805; Fri, 20 Jun 2025 15:42:55 GMT (envelope-from git) Date: Fri, 20 Jun 2025 15:42:55 GMT Message-Id: <202506201542.55KFgtEW065805@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 28d9586cde8d - main - diff: Fix gcc build. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 28d9586cde8dc783f7b698b10c2b564fde14ae74 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=28d9586cde8dc783f7b698b10c2b564fde14ae74 commit 28d9586cde8dc783f7b698b10c2b564fde14ae74 Author: Dag-Erling Smørgrav AuthorDate: 2025-06-20 15:30:03 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-06-20 15:42:40 +0000 diff: Fix gcc build. Sponsored by: Klara, Inc. --- 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 df65a84ca391..fb76a5768e1a 100644 --- a/usr.bin/diff/diffdir.c +++ b/usr.bin/diff/diffdir.c @@ -63,8 +63,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; @@ -83,7 +83,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);