From nobody Tue Dec 05 01:48:38 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 4Skk2t73BSz5368w; Tue, 5 Dec 2023 01:48: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 4Skk2t6Vz8z3JDj; Tue, 5 Dec 2023 01:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740918; 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=8UOx8taW1PZIxLYeVZRlYbCjDXNrk66kNzh7ZXiQb9o=; b=WWEENVDp6Exgki+vTyDvS8TkCHxR5yBHxuuIGHi7pxRHUjNLc1kO0CdJodiumxPTvGO5ZY hBDhxQ/7RSHK/WTL7YADAG1tTfJV1kk6RTbKwTY9qu6JrsVzI6gxYTW8az9eeCk//EYJXQ hX6wCXYhwt1TuyW0r1sVYKglcpsBKrWNQcg6zbqDRnb6UfP0lMSgResDq8oXdDpbv4agNo ieqwXegBsJuADCC48zqEIjH4JkEBJoWL+baQU2ZjfcGEj7d6EyLCzx4HN7hu2qlR1Bvh/5 YHyZv1MwDlfSdQ4FSZLfFZEvxKskbo7+I5NlQlpEBnxi/OmaYuydxfNblurtRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701740918; 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=8UOx8taW1PZIxLYeVZRlYbCjDXNrk66kNzh7ZXiQb9o=; b=u3AOWuQrVKUi5LKp9m38lfSFkzBdNPpyM4PS8pZ+Gg429tojkjlskucegF3raxHbY5xT6N kX4wcInB5mg9xwkI1Zxei1RDS8I/d8S/xcMQEo16WMmlK+Dz/UIu3pA0nIwY16dsyvY21p HM7KjHypfPtv6HQB9hJ5AxwHjkuyVg8CF1IeB6DIbxYzpMfhXqsx10EXTZK3CCRBcJrx1z 6ZEITdN/mROv6ocsv/17wuzxAiO5gugTX/kBVpCJnHAy1Kmw0Bvsr3gW5FrNq+lShrj0IT Uv1XN/b4EUbS/ojQtzaaOSMtDwJo9hioYjAk+p++wKIY7VoVKUj2HniOEPiNWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701740918; a=rsa-sha256; cv=none; b=b/B4YaT8vMiGIc7Z/YPMW7kSA0K5TWafQPvATz/+rDra+RkqJHzBsVqG2v7a5gqgQUHZPL DkNhaC0oGBLdVbrBywxS1BiBYE/YivfAY8PBXuUp5d3Xi5hF6fbXdtPwdLXqFncrxZr51b Axd5DBEMwxT/Oo+aHL7U7EzOCHuyBIEPSX8gBYrLgKPY/UkJVNDJVG51Afy6KlpsBFEx8O dJm7uMeyidhkfCM1meWvDgKvoOwUgirFs6btStCMllo9MieRlQ3WWD3jAo7O0k4SSiZuNj yJMXJ+zp3WdrWWFn06p+isLGjf+gtpPq6tJ6ggsXc1SFLVFbT/R46Y45ndAjBg== 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 4Skk2t5Yznzqt7; Tue, 5 Dec 2023 01:48:38 +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 3B51mc2w031675; Tue, 5 Dec 2023 01:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B51mc6s031672; Tue, 5 Dec 2023 01:48:38 GMT (envelope-from git) Date: Tue, 5 Dec 2023 01:48:38 GMT Message-Id: <202312050148.3B51mc6s031672@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: 4d4b3a342677 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 4d4b3a34267787a03f03125fc01532ff2f8539d1 Auto-Submitted: auto-generated The branch stable/13 has been updated by sobomax: URL: https://cgit.FreeBSD.org/src/commit/?id=4d4b3a34267787a03f03125fc01532ff2f8539d1 commit 4d4b3a34267787a03f03125fc01532ff2f8539d1 Author: Maxim Sobolev AuthorDate: 2023-12-05 01:39:21 +0000 Commit: Maxim Sobolev CommitDate: 2023-12-05 01:48:21 +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 50a31dc287f7..bb465eda4966 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");