From b5965b56e847f05879bd3863f567d876f8e7d3e3 Mon Sep 17 00:00:00 2001 From: Rick Macklem Date: Sun, 28 Jul 2019 21:44:01 +0000 Subject: [PATCH] Fix printing of Server Re-Failed and Server Faults. nfsstat -s prints bogus large numbers for the Server Re-Failed and Server Faults fields. This was introduced by r328588. Although I know nothing about libxo, these lines aren't titles and this patch seems to fix the problem, so I am committing it for rea@ who emailed it to me. It also deleted the trailing ':' from the title lines, since those were not in the pre-r328588 output. If there is a more correct fix, someone conversant with libxo will need to do so. Submitted by: rea MFC after: 2 weeks --- usr.bin/nfsstat/nfsstat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/nfsstat/nfsstat.c b/usr.bin/nfsstat/nfsstat.c index f4a4318d8f95..090959df83c8 100644 --- a/usr.bin/nfsstat/nfsstat.c +++ b/usr.bin/nfsstat/nfsstat.c @@ -460,11 +460,11 @@ intpr(int clientOnly, int serverOnly) xo_close_container("operations"); xo_open_container("server"); - xo_emit("{T:Server Re-Failed:}\n"); - xo_emit("{T:retfailed/%17ju}\n", (uintmax_t)ext_nfsstats.srvrpc_errs); + xo_emit("{T:Server Re-Failed}\n"); + xo_emit("{:retfailed/%16ju}\n", (uintmax_t)ext_nfsstats.srvrpc_errs); - xo_emit("{T:Server Faults:}\n"); - xo_emit("{T:faults/%13ju}\n", (uintmax_t)ext_nfsstats.srv_errs); + xo_emit("{T:Server Faults}\n"); + xo_emit("{:faults/%13ju}\n", (uintmax_t)ext_nfsstats.srv_errs); xo_emit("{T:Server Write Gathering:/%13.13s}\n");