httpd: trivial simplification

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

diff --git a/networking/nameif.c b/networking/nameif.c
index 385e7fb718e02d46a16b1c56d143639bd09e05c3..2114516a7af980feae6d27b5cc55bf8ed795833e 100644 (file)
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -4,12 +4,12 @@
  *
  * Written 2000 by Andi Kleen.
  * Busybox port 2002 by Nick Fedchik <nick@fedchik.org.ua>
- *                     Glenn McGrath <bug1@iinet.net.au>
+ *                     Glenn McGrath 
  *
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 #include <syslog.h>
 #include <net/if.h>
 #include <netinet/ether.h>
@@ -55,6 +55,7 @@ static struct ether_addr *cc_macaddr(const char *str_macaddr)
        return mac;
 }
 
+int nameif_main(int argc, char **argv);
 int nameif_main(int argc, char **argv)
 {
        mactable_t *clist = NULL;
@@ -65,7 +66,7 @@ int nameif_main(int argc, char **argv)
        int if_index = 1;
        mactable_t *ch;
 
-       if (1 & getopt32(argc, argv, "sc:", &fname)) {
+       if (1 & getopt32(argv, "sc:", &fname)) {
                openlog(applet_name, 0, LOG_LOCAL0);
                logmode = LOGMODE_SYSLOG;
        }
@@ -78,7 +79,7 @@ int nameif_main(int argc, char **argv)
 
                while (*a) {
                        if (strlen(*a) > IF_NAMESIZE)
-                               bb_error_msg_and_die("interface name `%s' "
+                               bb_error_msg_and_die("interface name '%s' "
                                            "too long", *a);
                        ch = xzalloc(sizeof(mactable_t));
                        ch->ifname = xstrdup(*a++);
@@ -104,7 +105,7 @@ int nameif_main(int argc, char **argv)
                        ch = xzalloc(sizeof(mactable_t));
                        ch->ifname = xstrndup(line_ptr, name_length);
                        if (name_length > IF_NAMESIZE)
-                               bb_error_msg_and_die("interface name `%s' "
+                               bb_error_msg_and_die("interface name '%s' "
                                                "too long", ch->ifname);
                        line_ptr += name_length;
                        line_ptr += strspn(line_ptr, " \t");
@@ -147,9 +148,9 @@ int nameif_main(int argc, char **argv)
                        continue;
 
                strcpy(ifr.ifr_newname, ch->ifname);
-               if (ioctl(ctl_sk, SIOCSIFNAME, &ifr) < 0)
-                       bb_perror_msg_and_die("cannot change ifname %s to %s",
-                                  ifr.ifr_name, ch->ifname);
+               ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
+                                       "cannot change ifname %s to %s",
+                                       ifr.ifr_name, ch->ifname);
 
                /* Remove list entry of renamed interface */
                if (ch->prev != NULL) {