d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

w: Complete libxo transition.

Browse Source 
MFC after:	1 week
Sponsred by:	Klara, Inc.
Reviewed by:	markj
Differential Revision:	https://reviews.freebsd.org/D38172
This commit is contained in:
Dag-Erling Smørgrav 2023-01-25 07:21:13 +01:00
parent 4c4a29267c
commit d90ff31ae5
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/w/w.c
View File

@ -67,7 +67,6 @@ static const char sccsid[] = "@(#)w.c 8.4 (Berkeley) 4/16/94";
#include <arpa/nameser.h> #include <arpa/nameser.h>
#include <ctype.h> #include <ctype.h>
#include <err.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <kvm.h> #include <kvm.h>
@ -189,7 +188,7 @@ main(int argc, char *argv[])
nflag += 1; nflag += 1;
break; break;
case 'f': case 'l': case 's': case 'u': case 'w': case 'f': case 'l': case 's': case 'u': case 'w':
warnx("-%c no longer supported", ch); xo_warnx("-%c no longer supported", ch);
/* FALLTHROUGH */ /* FALLTHROUGH */
case '?': case '?':
default: default:
@ -204,7 +203,7 @@ main(int argc, char *argv[])
_res.retry = 1; /* only try once.. */ _res.retry = 1; /* only try once.. */
if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL) if ((kd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, errbuf)) == NULL)
errx(1, "%s", errbuf); xo_errx(1, "%s", errbuf);
(void)time(&now); (void)time(&now);
@ -239,7 +238,7 @@ main(int argc, char *argv[])
continue; continue;
} }
if ((ep = calloc(1, sizeof(struct entry))) == NULL) if ((ep = calloc(1, sizeof(struct entry))) == NULL)
errx(1, "calloc"); xo_errx(1, "calloc");
*nextp = ep; *nextp = ep;
nextp = &ep->next; nextp = &ep->next;
memmove(&ep->utmp, utmp, sizeof *utmp); memmove(&ep->utmp, utmp, sizeof *utmp);
@ -338,7 +337,8 @@ main(int argc, char *argv[])
pr_header(&now, nusers); pr_header(&now, nusers);
if (wcmd == 0) { if (wcmd == 0) {
xo_close_container("uptime-information"); xo_close_container("uptime-information");
xo_finish(); if (xo_finish() < 0)
xo_err(1, "stdout");
(void)kvm_close(kd); (void)kvm_close(kd);
exit(0); exit(0);
} }
@ -351,7 +351,7 @@ main(int argc, char *argv[])
} }
if ((kp = kvm_getprocs(kd, KERN_PROC_ALL, 0, &nentries)) == NULL) 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++) { for (i = 0; i < nentries; i++, kp++) {
if (kp->ki_stat == SIDL || kp->ki_stat == SZOMB || if (kp->ki_stat == SIDL || kp->ki_stat == SZOMB ||
kp->ki_tdev == NODEV) kp->ki_tdev == NODEV)
@ -400,7 +400,7 @@ main(int argc, char *argv[])
ep->args = fmt_argv(kvm_getargv(kd, ep->kp, argwidth), ep->args = fmt_argv(kvm_getargv(kd, ep->kp, argwidth),
ep->kp->ki_comm, NULL, MAXCOMLEN); ep->kp->ki_comm, NULL, MAXCOMLEN);
if (ep->args == NULL) if (ep->args == NULL)
err(1, NULL); xo_err(1, NULL);
} }
/* sort by idle time */ /* sort by idle time */
if (sortidle && ehead != NULL) { if (sortidle && ehead != NULL) {
@ -472,7 +472,8 @@ main(int argc, char *argv[])
xo_close_list("user-entry"); xo_close_list("user-entry");
xo_close_container("user-table"); xo_close_container("user-table");
xo_close_container("uptime-information"); xo_close_container("uptime-information");
xo_finish(); if (xo_finish() < 0)
xo_err(1, "stdout");
(void)kvm_close(kd); (void)kvm_close(kd);
exit(0); exit(0);