jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-26 20:12:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

nfsstat(1): Complete libxo transition

Browse Source 
Reviewed by:	des
MFC after:	3 days
Differential Revision:	https://reviews.freebsd.org/D41428
This commit is contained in:
Yan-Hao Wang 2024-10-12 23:17:23 +08:00 committed by Li-Wen Hsu
parent 20bb77c4b9
commit b698093da4
No known key found for this signature in database
GPG Key ID: 7377A4A02A2954DD
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/nfsstat/nfsstat.c
View File

@ -83,7 +83,6 @@
#include <string.h>
#include <paths.h>
#include <devstat.h>
#include <err.h>
#include <libxo/xo.h>
@ -168,7 +167,7 @@ main(int argc, char **argv)
mntbuf->f_mntfromname,
mntbuf->f_mntonname, buf);
else if (errno == EPERM)
errx(1, "Only privileged users"
xo_errx(1, "Only privileged users"
" can use the -m option");
}
mntbuf++;
@ -241,7 +240,8 @@ main(int argc, char **argv)
xo_close_container("nfsstat");
}
xo_finish();
if (xo_finish() < 0)
xo_err(1, "stdout");
exit(0);
}
@ -505,8 +505,7 @@ printhdr(int clientOnly, int serverOnly, int newStats)
static void
usage(void)
{
(void)fprintf(stderr,
"usage: nfsstat [-cdEemqszW] [-w wait]\n");
xo_error("usage: nfsstat [-cdEemqszW] [-w wait]\n");
exit(1);
}
@ -1131,7 +1130,7 @@ exp_sidewaysintpr(u_int interval, int clientOnly, int serverOnly,
ext_nfsstatsp = &lastst;
ext_nfsstatsp->vers = NFSSTATS_V1;
if (nfssvc(NFSSVC_GETSTATS | NFSSVC_NEWSTRUCT, ext_nfsstatsp) < 0)
err(1, "Can't get stats");
xo_err(1, "Can't get stats");
clock_gettime(CLOCK_MONOTONIC, &lastts);
compute_totals(&lasttotal, ext_nfsstatsp);
sleep(interval);
@ -1141,7 +1140,7 @@ exp_sidewaysintpr(u_int interval, int clientOnly, int serverOnly,
ext_nfsstatsp->vers = NFSSTATS_V1;
if (nfssvc(NFSSVC_GETSTATS | NFSSVC_NEWSTRUCT, ext_nfsstatsp)
< 0)
err(1, "Can't get stats");
xo_err(1, "Can't get stats");
clock_gettime(CLOCK_MONOTONIC, &ts);
if (--hdrcnt == 0) {