From nobody Thu Oct 09 12:21:38 2025 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 4cj8BB6tGcz6BqdV; 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 4cj8BB5Q1Bz3RGf; Thu, 09 Oct 2025 12:21:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012498; 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=rnXqyUeJRDCbh3uK5VF9WFRr1iVB72WyI3bUxcMORug=; b=Dy8Fdn49sGHpRCWBqyHV+0INlO/m/IuE9qQoMOhxSCwRtjDUKpsL7ve/esF68yjeTtp8YU iFwMvOrA2O7qrvKbHAT6J2Qx++ChUSBuwdIUBUPdfcIQsU0rn0cPxWKjzvpoC6326Ptp9D pvhTepx2Xn5TQ9Elsnz+gH66zZIDbHqoBlSrqoAsuMlpoxAbDz+OSGpTBb4d7fSYF3fRfq Uw+Ga2uNuapASgasWeCemfJCv3WwzZ1gSMfQ0dUZzqhSjVq9aibx8OubuGmAT3hYyC7Vul hgJuq5mdZsnfo0dEuAipaMQurvH9aW/ZOpQkPgT4VE2N0r5HU3LZ4BYQR7FGPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760012498; 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=rnXqyUeJRDCbh3uK5VF9WFRr1iVB72WyI3bUxcMORug=; b=kb0cXKMQglp2ZnS8wY85T8gxlnIrmtqvYdlGBccTysfZGY88gOJbvEyhaMBH2ivs205t01 zn173M9/MrJ1wAmuBUWXLxEIUNXFLhES+KBrMYOYfUadpyBnijYkM3K6HOgRhAGFnDV18C +IFVyyFXuBmz639gXZWo2JRvAAFocrJP4QjitMJ1VGbvm1XnH96HEREjEWlLDFjKTe8j/1 0fnWvSjebjQoHDWdeWIHL6xUJXbJUnR/7r/YsNOLLdlQpTyqU4hL12Umt1C3PfMuGyqEyr WnMFFtc4UiWI6R8HeT4nIIJKtKCmQMvAJom4j6CNx4pTTVfD0OLs2FeTHDZc8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760012498; a=rsa-sha256; cv=none; b=I2/qeVUY69VdXsLIq7nL+B0kyv5HytRV5QK2zS6lJB7z0v4piGpso9Xvqgc42ce05E87WZ rjwGwnbW1nzEuYCJQ2Ute4BykbdXdvcQ4zT3jBvcGzQOog0ac+gnbtPP0l2iWOm3RWJA/F 7RsmIqSjZKhBRiUo6iUoBngVRUtccnb7VI8hKA2AAObx3jUc8quOvDz7KxajY0gaVYbrFL ZLGADt9xtCAewdon+65Ly7/sKsgizA/qcJUkovd9/0Mx/BCJ46CsoAhEnFj4mHjXUveM+I A/pSlN3efY2gRhfdY7wUuE5EKqDlkmSwehRVwmUScqgciNEFrX1ElXHRBGtApg== 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 4cj8BB4ZnLz20G; Thu, 09 Oct 2025 12:21:38 +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 599CLcUa048730; Thu, 9 Oct 2025 12:21:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CLc8H048727; Thu, 9 Oct 2025 12:21:38 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:21:38 GMT Message-Id: <202510091221.599CLc8H048727@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: 4fe1317fd986 - stable/14 - rcorder: Fix grammar in warning about loops 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: 4fe1317fd9865c23c3424467d07cdfc1eaebd640 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4fe1317fd9865c23c3424467d07cdfc1eaebd640 commit 4fe1317fd9865c23c3424467d07cdfc1eaebd640 Author: Dag-Erling Smørgrav AuthorDate: 2025-10-08 10:07:01 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-10-09 12:20:53 +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)); }