From nobody Thu Oct 16 07:15:19 2025 X-Original-To: dev-commits-src-branches@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 4cnK3W3sB7z6Ch0g; Thu, 16 Oct 2025 07:15:19 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cnK3W2c7Nz3L04; Thu, 16 Oct 2025 07:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760598919; 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=+Lsi4svnGszffw5MJfURORKRhk8mdBwKK6FvFa+206M=; b=FSNHK+k3el5zLMIR/VFhaDuJ6dLN2hXXUyjieSoLKZIx8EPpWpYdFYCI75Iin+XPWYf/B2 bWJJNmpNYkd03JZToLTVJVooCkSQxIJAGkj7JRYRSMIbIFtA7yNrnpba5lZWPJsRaPZPvM CtBYBs4HpFA3I4w4GEMUmzpKwQ+RHR6fSyiva8+T8byq7L/zGTuUDxr268RUi6Ug6+tZ9R SU0qOwsCZGzBbW3WL5idYheq2CsmLc1sGNozY03S7sgHaTClrmWKj5ew0K+H8Du1K0MKl2 D1HUGDHGqnLD5sw5Z3sh3F2o4n/3FuqvTmeTTwWZrnx04rbiaMat8KGwsuofEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760598919; 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=+Lsi4svnGszffw5MJfURORKRhk8mdBwKK6FvFa+206M=; b=v1Y5jBRO98ITjL6bZGQdZxDBU7oxfSbRwdjFlI0sDMUj7GfUsUGhB1I2NxA0vyJu86omJR XPiOpJYOcdg1fZk6D5g2iiYt0jT7gyBY7di+hof13jNbnjqsQud5upVLvffx7G+5y6Mydw ROCkgKIwHMypz3yToTeTy5R+Ljt4nNuwjT56yeCIcttLhvg2ojSCqjVlvHhkZi4qov4+9o kbwtKDV0IeEH5BbQlbZL0CtuoZ/0A0yOzXIpZ9yAFO/Lu7jAo6SXUSzEGHxWk3VXvFbzHK hkvbcrgzylOyXn9L4pKuPn4l+vhmg2fQ/EjCilOWolp4R7pqm3+Pn4tfVhL4/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760598919; a=rsa-sha256; cv=none; b=qihtCITAWPkMb8/0G+RJyU0I66aFDG74LUHxsMM9ico1EN4kI05inyMAnnc4k+LiW157VF qMK5uWwKG4FwTkD+TMAcaCocgICtV29nwxGVgmUquTK8jOkBFOV58Ry22TkTZuRTvkhNX7 egrpOscy/frPzjrqOEPRhlu30kc05LBET6c55uokTJ6Yu0vdy1St0QKrHQWUpB4xLflspR iXciVx5L/vF8tUA5FnJRjBbf+bRnLXpctTBEp0XVKCLqv8hB/FjQc07K5ib38RYz09GcvS U5B8zx05Upgp0Fd4PB/Q52KxDPKpGQXaweK+pG3UNhmhKLmZfquzFoY/VET/eg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cnK3W21JMz1Cs2; Thu, 16 Oct 2025 07:15:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59G7FJrs064913; Thu, 16 Oct 2025 07:15:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59G7FJIa064910; Thu, 16 Oct 2025 07:15:19 GMT (envelope-from git) Date: Thu, 16 Oct 2025 07:15:19 GMT Message-Id: <202510160715.59G7FJIa064910@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 9d53ea06b320 - stable/14 - arp(8): Complete libxo transition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d53ea06b32097a648fedbaf4abbe8ee54951225 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9d53ea06b32097a648fedbaf4abbe8ee54951225 commit 9d53ea06b32097a648fedbaf4abbe8ee54951225 Author: Yan-Hao Wang AuthorDate: 2024-10-12 14:38:45 +0000 Commit: Eugene Grosbein CommitDate: 2025-10-16 07:15:04 +0000 arp(8): Complete libxo transition Reviewed by: des MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41408 (cherry picked from commit 417842f908619336dd4c739a92c326ade2c35770) --- usr.sbin/arp/arp.c | 11 ++++++----- usr.sbin/arp/arp_netlink.c | 5 ++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 200912736137..fba6bdd57ed5 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -67,7 +67,6 @@ static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94"; #include #include -#include #include #include #include @@ -181,7 +180,8 @@ main(int argc, char *argv[]) xo_close_list("arp-cache"); xo_close_container("arp"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); } else { if (argc != 1) usage(); @@ -218,7 +218,7 @@ main(int argc, char *argv[]) if (ifnameindex != NULL) if_freenameindex(ifnameindex); - return (rtn); + exit(rtn); } /* @@ -458,7 +458,8 @@ get(char *host) xo_close_list("arp-cache"); xo_close_container("arp"); - xo_finish(); + if (xo_finish() < 0) + xo_err(1, "stdout"); return (found == 0); } @@ -735,7 +736,7 @@ nuke_entries(uint32_t ifindex, struct in_addr addr) static void usage(void) { - fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", + xo_error("%s\n%s\n%s\n%s\n%s\n%s\n%s\n", "usage: arp [-n] [-i interface] hostname", " arp [-n] [-i interface] -a", " arp -d hostname [pub]", diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index 24e01126044b..db1ef775dea2 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -2,7 +2,6 @@ #include #include #include -#include #include #include @@ -43,12 +42,12 @@ nl_init_socket(struct snl_state *ss) if (modfind("netlink") == -1 && errno == ENOENT) { /* Try to load */ if (kldload("netlink") == -1) - err(1, "netlink is not loaded and load attempt failed"); + xo_err(1, "netlink is not loaded and load attempt failed"); if (snl_init(ss, NETLINK_ROUTE)) return; } - err(1, "unable to open netlink socket"); + xo_err(1, "unable to open netlink socket"); } static bool