diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-07 01:14:45 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-07 01:14:45 +0000 |
| commit | 540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e (patch) | |
| tree | 1d5e5c26d7bcffe29d58d50305ca1e2408f1985a /networking/ip.c | |
| parent | fbd2918f5c91723063ed698026217a77a0fe565b (diff) | |
| download | busybox-w32-540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e.tar.gz busybox-w32-540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e.tar.bz2 busybox-w32-540a2a1f3b056ddaea72f84c5a9b7ec947d75c8e.zip | |
libiproute: audit callgraph, shortcut error paths into die() functions.
Kill a few statics, made other globals smaller:
oneline is smallint, _SL_ is char
function old new delta
print_tunnel 693 731 +38
print_route 1775 1777 +2
print_addrinfo 1495 1497 +2
ipaddr_list_or_flush 2826 2828 +2
oneline 4 1 -3
_SL_ 4 1 -3
ipaddr_modify 1476 1472 -4
parse_address 124 119 -5
ip_parse_common_args 429 423 -6
on_off 53 46 -7
do_del_ioctl 113 106 -7
do_add_ioctl 120 113 -7
do_show 864 856 -8
iprule_list 157 148 -9
do_iptunnel 310 299 -11
do_add 143 126 -17
get_ctl_fd 95 76 -19
set_address 108 84 -24
ip_main 351 323 -28
static.ifr 32 - -32
parse_args 1992 1949 -43
iproute_list_or_flush 1673 1582 -91
do_iplink 1583 1485 -98
filter 280 - -280
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 4/18 up/down: 44/-702) Total: -658 bytes
Diffstat (limited to 'networking/ip.c')
| -rw-r--r-- | networking/ip.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/networking/ip.c b/networking/ip.c index fdd848049..d51689542 100644 --- a/networking/ip.c +++ b/networking/ip.c | |||
| @@ -20,31 +20,28 @@ | |||
| 20 | int ip_main(int argc, char **argv); | 20 | int ip_main(int argc, char **argv); |
| 21 | int ip_main(int argc, char **argv) | 21 | int ip_main(int argc, char **argv) |
| 22 | { | 22 | { |
| 23 | int ret = EXIT_FAILURE; | ||
| 24 | |||
| 25 | ip_parse_common_args(&argc, &argv); | 23 | ip_parse_common_args(&argc, &argv); |
| 26 | 24 | ||
| 27 | if (argc > 1) { | 25 | if (argc <= 1) |
| 28 | if (ENABLE_FEATURE_IP_ADDRESS && matches(argv[1], "address") == 0) { | ||
| 29 | ret = do_ipaddr(argc-2, argv+2); | ||
| 30 | } | ||
| 31 | if (ENABLE_FEATURE_IP_ROUTE && matches(argv[1], "route") == 0) { | ||
| 32 | ret = do_iproute(argc-2, argv+2); | ||
| 33 | } | ||
| 34 | if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) { | ||
| 35 | ret = do_iplink(argc-2, argv+2); | ||
| 36 | } | ||
| 37 | if (ENABLE_FEATURE_IP_TUNNEL | ||
| 38 | && (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0) | ||
| 39 | ) { | ||
| 40 | ret = do_iptunnel(argc-2, argv+2); | ||
| 41 | } | ||
| 42 | if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) { | ||
| 43 | ret = do_iprule(argc-2, argv+2); | ||
| 44 | } | ||
| 45 | } | ||
| 46 | if (ret) { | ||
| 47 | bb_show_usage(); | 26 | bb_show_usage(); |
| 27 | |||
| 28 | if (ENABLE_FEATURE_IP_ADDRESS && matches(argv[1], "address") == 0) { | ||
| 29 | return do_ipaddr(argc-2, argv+2); | ||
| 30 | } | ||
| 31 | if (ENABLE_FEATURE_IP_ROUTE && matches(argv[1], "route") == 0) { | ||
| 32 | return do_iproute(argc-2, argv+2); | ||
| 48 | } | 33 | } |
| 49 | return EXIT_SUCCESS; | 34 | if (ENABLE_FEATURE_IP_LINK && matches(argv[1], "link") == 0) { |
| 35 | return do_iplink(argc-2, argv+2); | ||
| 36 | } | ||
| 37 | if (ENABLE_FEATURE_IP_TUNNEL | ||
| 38 | && (matches(argv[1], "tunnel") == 0 || strcmp(argv[1], "tunl") == 0) | ||
| 39 | ) { | ||
| 40 | return do_iptunnel(argc-2, argv+2); | ||
| 41 | } | ||
| 42 | if (ENABLE_FEATURE_IP_RULE && matches(argv[1], "rule") == 0) { | ||
| 43 | return do_iprule(argc-2, argv+2); | ||
| 44 | } | ||
| 45 | |||
| 46 | bb_show_usage(); | ||
| 50 | } | 47 | } |