X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=networking%2Flibiproute%2Fll_addr.c;h=ba0a65a18c3b7242efad08e7500bf5ab4c9f6a41;hb=28703015ab71784f40bc97f720ed900e26bd03ca;hp=51ff13b8c0ec431fdbe6a2c2750eb09ea3301212;hpb=9a2d27249cc2235f7e001a9ea8d4605406bc5f38;p=oweals%2Fbusybox.git

diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c
index 51ff13b8c..ba0a65a18 100644
--- a/networking/libiproute/ll_addr.c
+++ b/networking/libiproute/ll_addr.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * ll_addr.c
  *
@@ -9,22 +10,12 @@
  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/ioctl.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <string.h>
+#include "libbb.h"
 
-#include <linux/netdevice.h>
-#include <linux/if_arp.h>
-#include <linux/sockios.h>
+#include <string.h>
+#include <net/if_arp.h>
 
+#include "rt_names.h"
 #include "utils.h"
 
 
@@ -57,11 +48,12 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 	if (strchr(arg, '.')) {
 		inet_prefix pfx;
 		if (get_addr_1(&pfx, arg, AF_INET)) {
-			fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg);
+			bb_error_msg("\"%s\" is invalid lladdr", arg);
 			return -1;
 		}
-		if (len < 4)
+		if (len < 4) {
 			return -1;
+		}
 		memcpy(lladdr, pfx.data, 4);
 		return 4;
 	} else {
@@ -75,16 +67,17 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg)
 				cp++;
 			}
 			if (sscanf(arg, "%x", &temp) != 1) {
-				fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg);
+				bb_error_msg("\"%s\" is invalid lladdr", arg);
 				return -1;
 			}
 			if (temp < 0 || temp > 255) {
-				fprintf(stderr, "\"%s\" is invalid lladdr.\n", arg);
+				bb_error_msg("\"%s\" is invalid lladdr", arg);
 				return -1;
 			}
 			lladdr[i] = temp;
-			if (!cp)
+			if (!cp) {
 				break;
+			}
 			arg = cp;
 		}
 		return i+1;