From nobody Wed Apr 5 22:40:38 2023 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 4PsKN65WB0z44H1R; Wed, 5 Apr 2023 22:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PsKN654njz44Tn; Wed, 5 Apr 2023 22:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680734438; 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=zDU35PeC/pRFnZAhF6eMx7T3VvMHcJLCGVn+3iCptGg=; b=JVPzLEMSuj0qZ5O/hIQtFLlVvImQD8Wyyymm6sa7f2I64q4TboSYy/3BiMPEW665gRob7P 3Ly12uoVUx8T5LBXUjVhwEGtCbJRB7NzzgCT7neJjWOIw93azFzSLnAkIKFiJGOVM1cF6m Yr29y07EA++E6P27YOQyFXg+8+6BUKLoM1vaiHGYN8FavjTqJoCft6t2MbXIm6kf8XNflH +8SmV+FjipPed8gwX6FhnO1SQmHpLyutA8iEWLJRUFPOItPG/r4GzFdXqsMrq/JpZ30wAn uiJU2iScdm4ejOAoe1Y/Q+yzjBTEG8H9y9V4ijGk1xxmY1WWyBnpJ/FSPnHt8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680734438; 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=zDU35PeC/pRFnZAhF6eMx7T3VvMHcJLCGVn+3iCptGg=; b=FkuFAIaw8bZB+humWj+DCFlWz03jU4PwbGNqHs+OSjPpNM03kzYdFr0pZFkddu24sXbb6a 9jsDuhk6yZz4ReVx+GTu16VcWPIOBdyFWwRfN+9LFTz/efckQs2VAcqLOq0NF3+aS4KNjW II+3H8LdWbKm2SAQl8SXpLnOeTe8pkkVCEdVf6nZ134MyqL2fXVQNZ9zVPLzP4NPhKkB/4 lBZwdIX5XMWW0JGPutYUwu8EMMbSyVHsdw+zV8GFSxiBh4+KYHFGuTwNcQoZlvASG9KKEa bIXn+69Gvzhmf3vckuPPfko+Fo83BmQ9dGBlTsuzQgHYypv6DrZsGleXvJeE8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680734438; a=rsa-sha256; cv=none; b=oFW3TNtsAnFV8pSgOJoYrNJLydV3jyL7KAaCqM+vq8CFc2qS7WGeiJWN4W127llvw3X7Ko qt22ocqKfZqBD2Y5W2SfEtLKaMbEQ0sDNuxxaOMQZZxKbZYed08lDWjGBhOfjAzRhv5fn5 QQOVjVqOVvBMXa8Ah1y2m0D9KCJrdEPdlTJVdugjeT4wQXeQf3hYMO2kqPOAOQBCwzPDOx bLb0U8fC23f/3VA4Xnh7012YmrlJCKFrtQqRFRW/l4KhyDQ4svHHDQ+9rSqrqBrfdp4GM2 QcuwAwZ9qupfn1IfNXXeUu6O4ug9nQ5sg2xoAqCHO+F41q/CB01g44Kx1H65mQ== 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 4PsKN648MyzgG8; Wed, 5 Apr 2023 22:40:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 335Meccr000651; Wed, 5 Apr 2023 22:40:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 335Meche000650; Wed, 5 Apr 2023 22:40:38 GMT (envelope-from git) Date: Wed, 5 Apr 2023 22:40:38 GMT Message-Id: <202304052240.335Meche000650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f21faa67ab6b - main - makefs(8): do not print comma after the last super-block 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f21faa67ab6bfe1acb0073287396b232fb11d05e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f21faa67ab6bfe1acb0073287396b232fb11d05e commit f21faa67ab6bfe1acb0073287396b232fb11d05e Author: Christos Margiolis AuthorDate: 2023-04-05 22:25:19 +0000 Commit: Mark Johnston CommitDate: 2023-04-05 22:25:19 +0000 makefs(8): do not print comma after the last super-block Reviewed by: markj, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39430 --- usr.sbin/makefs/ffs/mkfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/makefs/ffs/mkfs.c b/usr.sbin/makefs/ffs/mkfs.c index 0f8b040d6997..ef745fe3c196 100644 --- a/usr.sbin/makefs/ffs/mkfs.c +++ b/usr.sbin/makefs/ffs/mkfs.c @@ -529,8 +529,9 @@ ffs_mkfs(const char *fsys, const fsinfo_t *fsopts, time_t tstamp) initcg(cylno, tstamp, fsopts); if (cylno % nprintcols == 0) printf("\n"); - printf(" %*lld,", printcolwidth, - (long long)fsbtodb(&sblock, cgsblock(&sblock, cylno))); + printf(" %*lld%s", printcolwidth, + (long long)fsbtodb(&sblock, cgsblock(&sblock, cylno)), + cylno == sblock.fs_ncg - 1 ? "" : ","); fflush(stdout); } printf("\n");