diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2018-03-05 17:46:17 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2018-03-05 17:46:17 +0100 |
commit | 82ec89480d524a219ad027d1f7c5aa42cc6373d5 (patch) | |
tree | ad36e295337e149aa170b0d241a0b441d828dd3e /networking/ifconfig.c | |
parent | 8a5299fcfd54ae3b895b66249d6d105e956192cb (diff) | |
download | busybox-w32-82ec89480d524a219ad027d1f7c5aa42cc6373d5.tar.gz busybox-w32-82ec89480d524a219ad027d1f7c5aa42cc6373d5.tar.bz2 busybox-w32-82ec89480d524a219ad027d1f7c5aa42cc6373d5.zip |
networking/interface.c: get rid of global "smallint interface_opt_a"
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'networking/ifconfig.c')
-rw-r--r-- | networking/ifconfig.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 61d91788a..5c47abc16 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c | |||
@@ -338,6 +338,7 @@ int ifconfig_main(int argc UNUSED_PARAM, char **argv) | |||
338 | char *p; | 338 | char *p; |
339 | /*char host[128];*/ | 339 | /*char host[128];*/ |
340 | const char *host = NULL; /* make gcc happy */ | 340 | const char *host = NULL; /* make gcc happy */ |
341 | IF_FEATURE_IFCONFIG_STATUS(char *show_all_param;) | ||
341 | 342 | ||
342 | did_flags = 0; | 343 | did_flags = 0; |
343 | #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS | 344 | #if ENABLE_FEATURE_IFCONFIG_BROADCAST_PLUS |
@@ -349,15 +350,16 @@ int ifconfig_main(int argc UNUSED_PARAM, char **argv) | |||
349 | ++argv; | 350 | ++argv; |
350 | 351 | ||
351 | #if ENABLE_FEATURE_IFCONFIG_STATUS | 352 | #if ENABLE_FEATURE_IFCONFIG_STATUS |
352 | if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { | 353 | show_all_param = NULL; |
353 | interface_opt_a = 1; | 354 | if (argv[0] && argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2]) { |
354 | ++argv; | 355 | ++argv; |
356 | show_all_param = IFNAME_SHOW_DOWNED_TOO; | ||
355 | } | 357 | } |
356 | #endif | 358 | #endif |
357 | 359 | ||
358 | if (!argv[0] || !argv[1]) { /* one or no args */ | 360 | if (!argv[0] || !argv[1]) { /* one or no args */ |
359 | #if ENABLE_FEATURE_IFCONFIG_STATUS | 361 | #if ENABLE_FEATURE_IFCONFIG_STATUS |
360 | return display_interfaces(argv[0] /* can be NULL */); | 362 | return display_interfaces(argv[0] ? argv[0] : show_all_param); |
361 | #else | 363 | #else |
362 | bb_error_msg_and_die("no support for status display"); | 364 | bb_error_msg_and_die("no support for status display"); |
363 | #endif | 365 | #endif |