diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:04:04 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-17 09:04:04 +0000 |
commit | 85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50 (patch) | |
tree | 0b60f25ea0ebfbac5d9b3fa22f123aadaecd6663 /networking/ifupdown.c | |
parent | 081eb71ebd7954a67287816a9a6fff80e8c5319a (diff) | |
download | busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.gz busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.tar.bz2 busybox-w32-85c247161b9e1e7c71ebcb874ed7b6a23b6a5b50.zip |
*: fix fallout from -Wunused-parameter
function old new delta
bbunpack 358 366 +8
passwd_main 1070 1072 +2
handle_incoming_and_exit 2651 2653 +2
getpty 88 86 -2
script_main 975 972 -3
inetd_main 2036 2033 -3
dname_enc 377 373 -4
make_new_session 474 462 -12
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 3/5 up/down: 12/-24) Total: -12 bytes
text data bss dec hex filename
797429 658 7428 805515 c4a8b busybox_old
797417 658 7428 805503 c4a7f busybox_unstripped
Diffstat (limited to 'networking/ifupdown.c')
-rw-r--r-- | networking/ifupdown.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 6aa929a30..586c3db63 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -483,9 +483,9 @@ static const struct dhcp_client_t ext_dhcp_clients[] = { | |||
483 | }; | 483 | }; |
484 | #endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */ | 484 | #endif /* ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCPC */ |
485 | 485 | ||
486 | #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP | ||
486 | static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | 487 | static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) |
487 | { | 488 | { |
488 | #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP | ||
489 | int i; | 489 | int i; |
490 | #if ENABLE_FEATURE_IFUPDOWN_IP | 490 | #if ENABLE_FEATURE_IFUPDOWN_IP |
491 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ | 491 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ |
@@ -498,7 +498,10 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | |||
498 | } | 498 | } |
499 | bb_error_msg("no dhcp clients found"); | 499 | bb_error_msg("no dhcp clients found"); |
500 | return 0; | 500 | return 0; |
501 | } | ||
501 | #elif ENABLE_APP_UDHCPC | 502 | #elif ENABLE_APP_UDHCPC |
503 | static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | ||
504 | { | ||
502 | #if ENABLE_FEATURE_IFUPDOWN_IP | 505 | #if ENABLE_FEATURE_IFUPDOWN_IP |
503 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ | 506 | /* ip doesn't up iface when it configures it (unlike ifconfig) */ |
504 | if (!execute("ip link set %iface% up", ifd, exec)) | 507 | if (!execute("ip link set %iface% up", ifd, exec)) |
@@ -507,14 +510,18 @@ static int dhcp_up(struct interface_defn_t *ifd, execfn *exec) | |||
507 | return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid " | 510 | return execute("udhcpc -R -n -p /var/run/udhcpc.%iface%.pid " |
508 | "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]]", | 511 | "-i %iface%[[ -H %hostname%]][[ -c %clientid%]][[ -s %script%]]", |
509 | ifd, exec); | 512 | ifd, exec); |
513 | } | ||
510 | #else | 514 | #else |
515 | static int dhcp_up(struct interface_defn_t *ifd ATTRIBUTE_UNUSED, | ||
516 | execfn *exec ATTRIBUTE_UNUSED) | ||
517 | { | ||
511 | return 0; /* no dhcp support */ | 518 | return 0; /* no dhcp support */ |
512 | #endif | ||
513 | } | 519 | } |
520 | #endif | ||
514 | 521 | ||
522 | #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP | ||
515 | static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) | 523 | static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) |
516 | { | 524 | { |
517 | #if ENABLE_FEATURE_IFUPDOWN_EXTERNAL_DHCP | ||
518 | int i; | 525 | int i; |
519 | for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { | 526 | for (i = 0; i < ARRAY_SIZE(ext_dhcp_clients); i++) { |
520 | if (exists_execable(ext_dhcp_clients[i].name)) | 527 | if (exists_execable(ext_dhcp_clients[i].name)) |
@@ -522,13 +529,20 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) | |||
522 | } | 529 | } |
523 | bb_error_msg("no dhcp clients found, using static interface shutdown"); | 530 | bb_error_msg("no dhcp clients found, using static interface shutdown"); |
524 | return static_down(ifd, exec); | 531 | return static_down(ifd, exec); |
532 | } | ||
525 | #elif ENABLE_APP_UDHCPC | 533 | #elif ENABLE_APP_UDHCPC |
534 | static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) | ||
535 | { | ||
526 | return execute("kill " | 536 | return execute("kill " |
527 | "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); | 537 | "`cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); |
538 | } | ||
528 | #else | 539 | #else |
540 | static int dhcp_down(struct interface_defn_t *ifd ATTRIBUTE_UNUSED, | ||
541 | execfn *exec ATTRIBUTE_UNUSED) | ||
542 | { | ||
529 | return 0; /* no dhcp support */ | 543 | return 0; /* no dhcp support */ |
530 | #endif | ||
531 | } | 544 | } |
545 | #endif | ||
532 | 546 | ||
533 | static int manual_up_down(struct interface_defn_t *ifd ATTRIBUTE_UNUSED, execfn *exec ATTRIBUTE_UNUSED) | 547 | static int manual_up_down(struct interface_defn_t *ifd ATTRIBUTE_UNUSED, execfn *exec ATTRIBUTE_UNUSED) |
534 | { | 548 | { |