Date: Thu, 9 Feb 2023 20:40:42 GMT From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: a6edc5b39209 - stable/13 - w: Complete libxo transition. Message-ID: <202302092040.319KegGX093940@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a6edc5b3920944ee42ba101214ada142c55f6301 commit a6edc5b3920944ee42ba101214ada142c55f6301 Author: Dag-Erling Smørgrav <des@FreeBSD.org> AuthorDate: 2023-01-25 06:21:13 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2023-02-09 20:32:56 +0000 w: Complete libxo transition. MFC after: 1 week Sponsred by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D38172 (cherry picked from commit d90ff31ae5cd9ba073fbd6a7b2367b5209ea534e) w: Unlike err(3), xo_err(3) won't accept a null format string. MFC after: 1 week X-MFC-with: d90ff31ae5cd Sponsored by: Klara, Inc. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D38192 (cherry picked from commit 6fc1bbbf62bda2f1b5be3a4be3d36bc964490ebe) --- usr.bin/w/w.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index b06d605438ca..5ba9f49cdd35 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -67,7 +67,6 @@ static const char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94"; #include <arpa/nameser.h> #include <ctype.h> -#include <err.h> #include <errno.h> #include <fcntl.h> #include <kvm.h> @@ -189,7 +188,7 @@ main(int argc, char *argv[]) nflag += 1; break; case 'f': case 'l': case 's': case 'u': case 'w': - warnx("-%c no longer supported", ch); + xo_warnx("-%c no longer supported", ch); /* FALLTHROUGH */ case '?': default: @@ -204,7 +203,7 @@ main(int argc, char *argv[]) _res.retry = 1; /* only try once.. */ if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL) - errx(1, "%s", errbuf); + xo_errx(1, "%s", errbuf); (void)time(&now); @@ -239,7 +238,7 @@ main(int argc, char *argv[]) continue; } if ((ep = calloc(1, sizeof(struct entry))) == NULL) - errx(1, "calloc"); + xo_errx(1, "calloc"); *nextp = ep; nextp = &ep->next; memmove(&ep->utmp, utmp, sizeof *utmp); @@ -338,7 +337,8 @@ main(int argc, char *argv[]) pr_header(&now, nusers); if (wcmd == 0) { xo_close_container("uptime-information"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); (void)kvm_close(kd); exit(0); } @@ -351,7 +351,7 @@ main(int argc, char *argv[]) } if ((kp = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nentries)) == NULL) - err(1, "%s", kvm_geterr(kd)); + xo_err(1, "%s", kvm_geterr(kd)); for (i = 0; i < nentries; i++, kp++) { if (kp->ki_stat == SIDL || kp->ki_stat == SZOMB || kp->ki_tdev == NODEV) @@ -397,7 +397,7 @@ main(int argc, char *argv[]) ep->args = fmt_argv(kvm_getargv(kd, ep->kp, argwidth), ep->kp->ki_comm, NULL, MAXCOMLEN); if (ep->args == NULL) - err(1, NULL); + xo_err(1, "fmt_argv"); } /* sort by idle time */ if (sortidle && ehead != NULL) { @@ -469,7 +469,8 @@ main(int argc, char *argv[]) xo_close_list("user-entry"); xo_close_container("user-table"); xo_close_container("uptime-information"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); (void)kvm_close(kd); exit(0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302092040.319KegGX093940>