From nobody Thu Oct 9 12:21:37 2025 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 4cj8BB2Rz2z6BqJs; Thu, 09 Oct 2025 12:21:38 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cj8B962XDz3RCD; Thu, 09 Oct 2025 12:21:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012497; 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=U2ff1CwO/7dTddDIo1hE0pQYCiHDACoFOqc4Uts51NE=; b=VMfNtX9WJUwPq8K1yzp+uFZMlYTxPcIPUw3B2S8iA1/O+3HQjtOgxa+vdsBL/riKnVLXPD cep2BcTtblL+hg1qO4n5Acye6vloFiD+5Wur2HMA9risAeRNEw91xbSbskAs9udwv7SX8p S8JChmp0D+LUXFwipWPXWuoCIcwESaHHcdnKpErTUH/rXimSlUMP9zDMb39kRKOsD+Toi8 CmzLiA118tX/a2QbegSUPOU2QDosYma8VZC5twbe91RTvXzk/H+mA96gu0KINSiFnBAKE7 vWu1XNK58HPFXCASQPdHm10UWrpl0w9sL0Hr1S04cpEQWXu7ad/DKG1KbaJGMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012497; 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=U2ff1CwO/7dTddDIo1hE0pQYCiHDACoFOqc4Uts51NE=; b=qCXvEFLP61uZ1AFarpYLt9HA1kkz7YLm8R8Lq3i7nC+bcNCPNQ9fBm9rMTIYwrOAiQFT6v 4vGKSN56TMx4+lvL+gqeHr40XqYRiqjGBBq/I2eTfCC4bmUt0gMD6EPYJvX+fDUU8kJ37/ 2IsQH6pT9YD+4KlNa8G8F183HT8uOtJR7jiyV4fsT1ubGL4Lf0ReqCuhGLm3QdgwQ/f0ey ZtSeFrnBPbBg4As3vvzBrMRMU5Tfrl3etGUdE+qJ/cvcNo0n0t43kx5nGT6n9GtHFIRf3l DUjit0PYH3fh56d0Wp9SVeJXmgI04rEgwBq8eqQukWSTuj1w+Zlaw+3hYNmwyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012497; a=rsa-sha256; cv=none; b=SuKfifuhL88hOolfY/+9XYZbF/9EYcZ/gtTahn6Zy4DuEH3SR5PmAQF3FLJCt5PlBvU4aB bEjMGDY+B5SuyDjeBjsosNH1VUiKHjFpzbSiJJW6AG3WSpz45ZO6A2iSzlFEOycRmtVMNP 5De8jirThlspNXepi/sfpeRZNpozN4sRF+84wT9qKNFslub5gfWlI2ZjbbEqoro1DFSKr5 xiwdwMuIBnTz4mvoxEmMVH1GKH/xNKcg4pBMwBEenvWcXz1xixDG8B+wtyhOTY1x7dMYKF s49pF4VTmhcJ3VkNOIo1miCH6KQJJ7vN/S93LIldQrrE+aaskfv4J+9KhskcVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cj8B95NbNz1th; Thu, 09 Oct 2025 12:21:37 +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 599CLbnB048092; Thu, 9 Oct 2025 12:21:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLbMa048086; Thu, 9 Oct 2025 12:21:37 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:37 GMT Message-Id: <202510091221.599CLbMa048086@gitrepo.freebsd.org> 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=B8rgrav?= Subject: git: 86eecff20db7 - stable/15 - rcorder: Fix grammar in warning about loops 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/15 X-Git-Reftype: branch X-Git-Commit: 86eecff20db7e78b2da36c2e0be821bd66cdf167 Auto-Submitted: auto-generated The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=86eecff20db7e78b2da36c2e0be821bd66cdf167 commit 86eecff20db7e78b2da36c2e0be821bd66cdf167 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-08 10:07:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-09 12:16:05 +0000 rcorder: Fix grammar in warning about loops MFC after: 1 week Reviewed by: ae Differential Revision: https://reviews.freebsd.org/D52951 (cherry picked from commit d96f9a4688668ececc09c61dcf6b539a55112cc0) --- sbin/rcorder/rcorder.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c index 87b0e873c7ae..3d2a67c82a5a 100644 --- a/sbin/rcorder/rcorder.c +++ b/sbin/rcorder/rcorder.c @@ -980,9 +980,11 @@ do_file(filenode *fnode, strnodelist *stack_ptr) fnode->last->next = fnode->next; } - if (fnode->issues_count) - warnx("`%s' was seen in circular dependencies for %d times.", - fnode->filename, fnode->issues_count); + if (fnode->issues_count) { + warnx("`%s' was seen in circular dependencies %d time%s.", + fnode->filename, fnode->issues_count, + fnode->issues_count > 1 ? "s" : ""); + } DPRINTF((stderr, "nuking %s\n", fnode->filename)); }