Page MenuHomeFreeBSD
Files F107694055

D41408.diff
No OneTemporary
Actions

D41408.diff
View Options

diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@@ -55,7 +55,6 @@
#include <arpa/inet.h>
#include <ctype.h>
-#include <err.h>
#include <errno.h>
#include <netdb.h>
#include <nlist.h>
@@ -169,7 +168,8 @@
xo_close_list("arp-cache");
xo_close_container("arp");
- xo_finish();
+ if (xo_finish() < 0)
+ xo_err(1, "stdout");
} else {
if (argc != 1)
usage();
@@ -206,7 +206,7 @@
if (ifnameindex != NULL)
if_freenameindex(ifnameindex);
- return (rtn);
+ exit(rtn);
}
/*
@@ -446,7 +446,8 @@
xo_close_list("arp-cache");
xo_close_container("arp");
- xo_finish();
+ if (xo_finish() < 0)
+ xo_err(1, "stdout");
return (found == 0);
}
@@ -723,7 +724,7 @@
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
--- a/usr.sbin/arp/arp_netlink.c
+++ b/usr.sbin/arp/arp_netlink.c
@@ -2,7 +2,6 @@
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
-#include <err.h>
#include <errno.h>
#include <netdb.h>
@@ -43,12 +42,12 @@
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

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 18, 3:15 PM (18 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15864745
Default Alt Text
D41408.diff (1 KB)

Event Timeline