From nobody Wed Apr 12 14:22:17 2023 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 4PxPzw5YJPz44rV6; Wed, 12 Apr 2023 14:22:20 +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 4PxPzt2KL2z3jjW; Wed, 12 Apr 2023 14:22:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681309338; 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=8KABDxUZaqvrClqtSf5RvZwAQYZemr/SvrhGWC204eM=; b=vwKdeHK6lcJeBfau7leHlkcumbjmcJEJCFtw2rTutNMpcu7TEt2PItBnhJYoz8bwPaT3Kq RH0wyBE7uY8d+hcF91B3HBKt2VTFUWAlmsZHz4QYKNWkl8OBtHtZwgKXstBixRqaSUpSqX rgbvuHyuZMgzv/9KC09xm6EFRkES90dcTEonnwIZHO7Z0gMrB9zlEK8Bn41kDk9NvaVmhB CzisJcBU159mqztu38aG9Oy/DbCJsmS34Icx0KaaTPNilfRQO3AIxMbVpVeDkxBZoEez1A WhPXkBN4dkkCwvuqkg5oy0gv4XnPSPMEMcS69Nl969E/J4eQXd4cemzjWht8Bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681309338; 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=8KABDxUZaqvrClqtSf5RvZwAQYZemr/SvrhGWC204eM=; b=he02x5jR6ZoRIMWJNr/QSZaCqRRnD9CfJ5XyVgVI3B4DGc4IiRZfII8PzeSAjUcz4kos4I /xP497utBm+E1IMeF3WK/a+iLN+JkltSuYMLw2vyjdLSqsU5zmb7HW7XoajIppgEV+c3ty GXtJkvtHy44w+RVYw17esvrKSYFBd3nx30E2PwWMXnLM8SvrBH2LOwODDRL5BDehWrwM5O nn5on94IRvcMOku2YNokaC0HURBGJaeRyuhz9Ie6lHIm3Ny8YdmuyKs61LXtRZHhiaNR9l nNlj5awjcGrfF0dIfg/QzHOi3IC0zO4vxFAFj9Q2TB9dAVwe642tUtKbjbBLsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681309338; a=rsa-sha256; cv=none; b=edhTpYr2v9l9Uofk1dp0vfdOYfsv5ArkPUoxCJ3eLqqP6hhUAiPRGCjixnbfhabT+/A6/i C6Pk/C9u6UlRSvPLB9FAVQPRZzQy664oS9t/zMWc2ZdOMDbGuvIg4eRPFmM4VjlItE5br/ 7NPt618CnukeSkU7W5rvtUR7BihjkXOjrob7jH05nHjfpnCJeHJa1QVz2vO5pkWG3LsVaP rg9YheengzUineaYiymLDMFcgx2nV9rnPgPHE8lsO8HNHS5jXW9sD7veyNKOhZjp9nAgS7 Kk0dKgbHhhhpic7iDfP89UqnMt8SjZhVWA95UgvyoYjUDf22tKotACiWsPsgIg== 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 4PxPzs4ZK3z12Sm; Wed, 12 Apr 2023 14:22:17 +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 33CEMHVV084711; Wed, 12 Apr 2023 14:22:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33CEMHq3084710; Wed, 12 Apr 2023 14:22:17 GMT (envelope-from git) Date: Wed, 12 Apr 2023 14:22:17 GMT Message-Id: <202304121422.33CEMHq3084710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 18eb15bd8a11 - stable/13 - makefs(8): do not print comma after the last super-block 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 18eb15bd8a11dc8e79b5a3de8629627d425b24db Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=18eb15bd8a11dc8e79b5a3de8629627d425b24db commit 18eb15bd8a11dc8e79b5a3de8629627d425b24db Author: Christos Margiolis AuthorDate: 2023-04-05 22:25:19 +0000 Commit: Mark Johnston CommitDate: 2023-04-12 14:18:37 +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 (cherry picked from commit f21faa67ab6bfe1acb0073287396b232fb11d05e) --- 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");