emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nameif: fix parsing of /proc/net/dev; small code shrink

Browse Source 
function                                             old     new   delta
nameif_main                                          628     618     -10

Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Phil Sutter 2011-03-06 19:15:30 +01:00 committed by Denys Vlasenko
parent bd74e3d8be
commit 2adc0e6d8b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
networking/nameif.c
View File

@ -133,7 +133,7 @@ void delete_eth_table(ethtable_t *ch);
#endif
int nameif_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int nameif_main(int argc, char **argv)
int nameif_main(int argc UNUSED_PARAM, char **argv)
{
ethtable_t *clist = NULL;
const char *fname = "/etc/mactab";
@ -148,17 +148,15 @@ int nameif_main(int argc, char **argv)
* can't hurt. 2>/dev/null if you don't like it: */
logmode |= LOGMODE_SYSLOG;
}
argc -= optind;
argv += optind;
if (argc & 1)
bb_show_usage();
if (argc) {
while (*argv) {
char *ifname = *argv++;
prepend_new_eth_table(&clist, ifname, *argv++);
}
if (argv[0]) {
do {
if (!argv[1])
bb_show_usage();
prepend_new_eth_table(&clist, argv[0], argv[1]);
argv += 2;
} while (*argv);
} else {
parser = config_open(fname);
while (config_read(parser, token, 2, 2, "# \t", PARSE_NORMAL))
@ -174,7 +172,7 @@ int nameif_main(int argc, char **argv)
#if ENABLE_FEATURE_NAMEIF_EXTENDED
struct ethtool_drvinfo drvinfo;
#endif
if (parser->lineno < 2)
if (parser->lineno <= 2)
continue; /* Skip the first two lines */
/* Find the current interface name and copy it to ifr.ifr_name */