Fix kbuild bugs noticed by Bernhard Fischer <rep.nop@aon.at>

[oweals/busybox.git] / networking / ifconfig.c

diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 1e1bd83eecdefc1b5367bff76cdae69e88824fac..59b6f0acc90d907551169c16a754b4226acfd0bf 100644 (file)
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /* ifconfig
  *
  * Similar to the standard Unix ifconfig, but with only the necessary
@@ -9,14 +10,7 @@
  * Authors of the original ifconfig was:
  *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
  *
- * This program is free software; you can redistribute it
- * and/or  modify it under  the terms of  the GNU General
- * Public  License as  published  by  the  Free  Software
- * Foundation;  either  version 2 of the License, or  (at
- * your option) any later version.
- *
- * $Id: ifconfig.c,v 1.30 2004/03/31 11:30:08 andersen Exp $
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
 /*
@@ -32,14 +26,6 @@
  * IPV6 support added by Bart Visscher <magick@linux-fan.com>
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>            /* strcmp and friends */
-#include <ctype.h>             /* isdigit and friends */
-#include <stddef.h>            /* offsetof */
-#include <unistd.h>
-#include <netdb.h>
-#include <sys/ioctl.h>
 #include <net/if.h>
 #include <net/if_arp.h>
 #include <netinet/in.h>
@@ -335,9 +321,7 @@ int ifconfig_main(int argc, char **argv)
        }
 
        /* Create a channel to the NET kernel. */
-       if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
-               bb_perror_msg_and_die("socket");
-       }
+       sockfd = xsocket(AF_INET, SOCK_DGRAM, 0);
 
        /* get interface name */
        safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
@@ -395,7 +379,8 @@ int ifconfig_main(int argc, char **argv)
 
                                                safe_strncpy(host, *argv, (sizeof host));
 #ifdef CONFIG_FEATURE_IPV6
-                                               if ((prefix = strchr(host, '/'))) {
+                                               prefix = strchr(host, '/');
+                                               if (prefix) {
                                                        if (safe_strtoi(prefix + 1, &prefix_len) ||
                                                                (prefix_len < 0) || (prefix_len > 128))
                                                        {