From nobody Wed Jan 25 06:22:50 2023 X-Original-To: dev-commits-src-all@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 4P1v0C0PYrz3bp3t; Wed, 25 Jan 2023 06:22:51 +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 4P1v0B70Wtz3Dsv; Wed, 25 Jan 2023 06:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674627771; 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=oj+JzWwZarC1Jok8EHqhA5JKvUx4B7UMaom4N4Bpahw=; b=sveP6XK/+vlGebgYi06YEliTfuCWFhD5tkNX2x5qgYO+VSooS8Dd2LBMSKSzaQ+wLCbAF+ CKeTs1y2SHC5J1FLx7AqzkYBal0Yc0aVVcTrXh1XDqj9GKgAmq/3dyKe5k9JXzSYaBWoAZ zSoohgQFXYCEb6mCmH5EBwiMo4Qcrng2oVatHsbaz+p/hKVp10r3Xf2MiEZYRDfuYAcMxu GUNQV37N+qpO9oVnPKUKQ3ZFfFcC/QoH7Z3DRt8e60eIvUu9c3F3iU97DV/zUgiUc+IICB z6k/CGJHsIWO2Te83fAFKdYrWJkOAk/4VGclHiEYwjhvP0FXswOsFEnJlevdog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674627771; 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=oj+JzWwZarC1Jok8EHqhA5JKvUx4B7UMaom4N4Bpahw=; b=gQsT0/cx3ssW/R3qa/Wu9ZUlhwWKwmMr0IvgaVtE3Cr2nhzjq0AJM2dKQQe/5+kNfe9hQ+ KVI9RcaJ/W5kGOKU611j6kYyvbbVdSGBaxoBwjY5dKZsDvJ/gMBhCMIjrBGZkg0dfxd3IF +Crt627f3EOnhLg44NPWHtyh/K8htYdkvwDohAyLwdLY50inEH99ePgMXO3ewVhs9cpFoM c6F9uIvTvVktJo2yAXsJgwwjrimnRLkDb5nXgsycbpY6k44XokGAy+9sGobfHncTfItUai ALF4T9u0halS0pZj3Hp+4eEt6wQLnIm4YPlBJ9/EhXbI3XFfqOHkXK0JXCUk0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674627771; a=rsa-sha256; cv=none; b=wQzi305WzAFaiwn4a6L5M5ZFSOMksRuTrL0f37z8RPq0U0mqBYM33iIi9C4L84jRmizb4H wo60csjN53teGmrLZWDul1vTeA4y7Vpss7Bhh6xItMTxmyCUjDH0r1+cC/c8Zeh+ru91TA bXE4IbX+7k0HxUlFkIG8Dgl10Eir/++To/wCT7XaFNuB8SX+yEB5tAp+7bYZE09H1WaR/k g/if4Y8yv0CLfs15uzWKWcsNUiro4cfDfx7/cKRL2YbR/k8frtLFahL+TOQhSFLqMUc7GJ guohi/4c1xvjhjMFpWMPCguDRhRMzCS9sifFYMryM7msvWvbfrxQkFhclpuXYg== 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 4P1v0B64GBzfmZ; Wed, 25 Jan 2023 06:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30P6Mojx095787; Wed, 25 Jan 2023 06:22:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30P6MoHI095786; Wed, 25 Jan 2023 06:22:50 GMT (envelope-from git) Date: Wed, 25 Jan 2023 06:22:50 GMT Message-Id: <202301250622.30P6MoHI095786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: d90ff31ae5cd - main - w: Complete libxo transition. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d90ff31ae5cd9ba073fbd6a7b2367b5209ea534e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d90ff31ae5cd9ba073fbd6a7b2367b5209ea534e commit d90ff31ae5cd9ba073fbd6a7b2367b5209ea534e Author: Dag-Erling Smørgrav AuthorDate: 2023-01-25 06:21:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-01-25 06:22:46 +0000 w: Complete libxo transition. MFC after: 1 week Sponsred by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D38172 --- 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 45e624c29460..8c33cd9d35b2 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 #include -#include #include #include #include @@ -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) @@ -400,7 +400,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, NULL); } /* sort by idle time */ if (sortidle && ehead != NULL) { @@ -472,7 +472,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);