Page MenuHomeFreeBSD
Files F165858359

D41408.id125821.diff
No OneTemporary
Actions

D41408.id125821.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
@@ -69,7 +69,7 @@
#include <arpa/inet.h>
#include <ctype.h>
-#include <err.h>
+
#include <errno.h>
#include <netdb.h>
#include <nlist.h>
@@ -121,11 +121,11 @@
main(int argc, char *argv[])
{
int ch, func = 0;
- int rtn = 0;
+ int rtn = EXIT_SUCCESS;
argc = xo_parse_args(argc, argv);
if (argc < 0)
- exit(1);
+ exit(EXIT_FAILURE);
while ((ch = getopt(argc, argv, "andfsSi:")) != -1)
switch(ch) {
@@ -185,7 +185,8 @@
xo_close_list("arp-cache");
xo_close_container("arp");
- xo_finish();
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
} else {
if (argc != 1)
usage();
@@ -198,7 +199,7 @@
usage();
if (func == F_REPLACE)
(void)delete(argv[0]);
- rtn = set(argc, argv) ? 1 : 0;
+ rtn = set(argc, argv) ? EXIT_FAILURE : EXIT_SUCCESS;
break;
case F_DELETE:
if (opts.aflag) {
@@ -222,7 +223,7 @@
if (ifnameindex != NULL)
if_freenameindex(ifnameindex);
- return (rtn);
+ exit(rtn);
}
/*
@@ -462,7 +463,8 @@
xo_close_list("arp-cache");
xo_close_container("arp");
- xo_finish();
+ if (xo_finish() < 0)
+ xo_err(EXIT_FAILURE, "stdout");
return (found == 0);
}
@@ -749,7 +751,7 @@
" arp -s hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
" arp -S hostname ether_addr [temp] [reject | blackhole] [pub [only]]",
" arp -f filename");
- exit(1);
+ exit(EXIT_FAILURE);
}
static struct rt_msghdr *
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,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdbool.h>
-#include <err.h>
+
#include <errno.h>
#include <netdb.h>
@@ -43,12 +43,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
Tue, Aug 11, 7:34 AM (53 m, 27 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
36469562
Default Alt Text
D41408.id125821.diff (2 KB)

Event Timeline