From nobody Tue Dec 05 01:47:25 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 4Skk1T3kktz535yR; Tue, 5 Dec 2023 01:47:25 +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 4Skk1T38ktz3Hlp; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740845; 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=henwYUPudXg/5ZPSepqdcP67wYC4pIilUnLCNxCFY9g=; b=LoY1ZZodOsrLKXtS2zPEOWnhSx+/5vYJnaXVHkFE3D/ZVK68BtOJwhErQHyqm/Va4hiBB4 lvTTQWNyAR6exLzzW7QW69ujOge9OqEWQy48b8+T4NFqWDvhcAD29PvRyE25sUYZubwlqg IN+OFXFf7poV/UunxH+VHkaVEh5zziABywxwT/aAEOtPNSMFRks8vtuGE2VSoBj6Xa/Q0j 8qjkfAM7Ac2VcMAQiZxCiMv/czRE1ayleMf6JMaBGoEIiEkU8YvjiaFnjd1zeI8YhmrXzw S35LItmdrWhwNMlHYIz4B4ZBMBvqrvI/fUs0TO2u/a2KbtkdN5yoBgp/YszwYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740845; 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=henwYUPudXg/5ZPSepqdcP67wYC4pIilUnLCNxCFY9g=; b=Ltm96xnzJqa0MNYlLfgENUC4DmOT6CfL8vl+/wxcpwxon4sJFh+VSOHM5Zj180D/ZY2tVZ HllqCBQie+LUIjVKwqSzGJM35Jczy6/FK4tEudUuzW+qAq4Cu0zVVlIqIcElXWx6Q1uDgR xPU0xQRuONBXlzptDWgwOXQt6kwOHNSSF8ljJGhwbKXtPZ+8mT1nohFNL1z6RJKytwBwo1 ZMPRp/wWmJCH5WlbW/Ve4uut+3T/sVvD3BIGNBqtbeW6cqnTSdQshQc8oXjZO8h44mkJDr zjHi++5IdifZ9Yb2S92RihMWVYPhM42z/5Vjuf036WbdXpC5n2PKm4stVMQyHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740845; a=rsa-sha256; cv=none; b=PNca+FCiCfE++j3rPzZyLPJS3l5QoyXpH2tmpLeKNhqU92FmcDqE//Pj0r9x42M0HCm85f Ic7sLO/guudXrvZ0nQJh7NLNZq4MC/bEvOXqcn/72dyLn5cGVrtI6/jsxoADb7HzSgZWXj Voje8/4Gry4QkcLWkhaEGzjvCm/AuVYW8MyLbSqpZNrrJnbq3kvYCChN2EErbeL7KsX3SN jY35JHqXa9Hi/R4AdWdFiVTIvih/9YcsVrtNkohHYNHusv8yPdGRYIpA22uTSaUowgiHzg 73DiPMosiMMknD1Un7CBZNN3E8W6HK8tlHmJUm+J4C8yHVS2di65wVTM30at2A== 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 4Skk1T2668zqPt; Tue, 5 Dec 2023 01:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B51lP8t031364; Tue, 5 Dec 2023 01:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51lPrD031361; Tue, 5 Dec 2023 01:47:25 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:47:25 GMT Message-Id: <202312050147.3B51lPrD031361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Sobolev Subject: git: 020432848ee5 - stable/14 - vmstat: fix column names broken in c168508655720 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: sobomax X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 020432848ee52adf37e5b073b1bdadb84be4dddb Auto-Submitted: auto-generated The branch stable/14 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=020432848ee52adf37e5b073b1bdadb84be4dddb commit 020432848ee52adf37e5b073b1bdadb84be4dddb Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:46:57 +0000 vmstat: fix column names broken in c168508655720 Loss of the trailing space in the multi-line format string has resulted in column name being emitted as "FAILSLEEP", instead of two columns "FAIL" and "SLEEP". (cherry picked from commit 62d47a4db4579315d7b89002d7de696b44ae1415) --- usr.bin/vmstat/vmstat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/vmstat/vmstat.c b/usr.bin/vmstat/vmstat.c index a03c28f19d00..fd161a3f93ee 100644 --- a/usr.bin/vmstat/vmstat.c +++ b/usr.bin/vmstat/vmstat.c @@ -1488,7 +1488,7 @@ domemstat_zone(void) } } xo_open_container("memory-zone-statistics"); - xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s}" + xo_emit("{T:/%-20s} {T:/%6s} {T:/%6s} {T:/%8s} {T:/%8s} {T:/%8s} {T:/%8s} " "{T:/%4s} {T:/%4s}\n", "ITEM", "SIZE", "LIMIT", "USED", "FREE", "REQ", "FAIL", "SLEEP", "XDOMAIN"); xo_open_list("zone");