ntpd: remove some code which is at best unneeded and at worst wrong

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

diff --git a/networking/nameif.c b/networking/nameif.c
index 4d68c8d63f800320e65ec3ab6e0e0031494c66da..36fbb954ebe6fcd0c020e01ce8eedf48aad91f11 100644 (file)
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -92,7 +92,7 @@ static void nameif_parse_selector(ethtable_t *ch, char *selector)
                        lmac = xmalloc(ETH_ALEN);
                        ch->mac = ether_aton_r(selector + (strncmp(selector, "mac=", 4) ? 0 : 4), lmac);
                        if (ch->mac == NULL)
-                               bb_error_msg_and_die("cannot parse %s", selector);
+                               bb_error_msg_and_die("can't parse %s", selector);
 #if  ENABLE_FEATURE_NAMEIF_EXTENDED
                        found_selector++;
                };
@@ -144,7 +144,9 @@ int nameif_main(int argc, char **argv)
 
        if (1 & getopt32(argv, "sc:", &fname)) {
                openlog(applet_name, 0, LOG_LOCAL0);
-               logmode = LOGMODE_SYSLOG;
+               /* Why not just "="? I assume logging to stderr
+                * can't hurt. 2>/dev/null if you don't like it: */
+               logmode |= LOGMODE_SYSLOG;
        }
        argc -= optind;
        argv += optind;
@@ -209,7 +211,7 @@ int nameif_main(int argc, char **argv)
                if (strcmp(ifr.ifr_name, ch->ifname) != 0) {
                        strcpy(ifr.ifr_newname, ch->ifname);
                        ioctl_or_perror_and_die(ctl_sk, SIOCSIFNAME, &ifr,
-                                       "cannot change ifname %s to %s",
+                                       "can't change ifname %s to %s",
                                        ifr.ifr_name, ch->ifname);
                }
                /* Remove list entry of renamed interface */