aboutsummaryrefslogtreecommitdiff
path: root/networking/ip.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2007-11-18 22:56:25 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2007-11-18 22:56:25 +0000
commited6a49c657ae204f6ba8ad84315fa04c09297a7c (patch)
tree5f47e19e16582dfcdefb99bc1edea693e86c258d /networking/ip.c
parent2a587df80a148e497d10344c79f2b94d3bce6aaf (diff)
downloadbusybox-w32-ed6a49c657ae204f6ba8ad84315fa04c09297a7c.tar.gz
busybox-w32-ed6a49c657ae204f6ba8ad84315fa04c09297a7c.tar.bz2
busybox-w32-ed6a49c657ae204f6ba8ad84315fa04c09297a7c.zip
ip: stop propagating argc; optimize ip_parse_common_args
function old new delta find_pair 167 187 +20 static.families - 17 +17 die_must_be_on_off - 11 +11 ... on_off 33 22 -11 do_ipaddr 103 90 -13 do_iptunnel 1001 986 -15 iproute_list_or_flush 1237 1217 -20 static.ip_common_commands 43 22 -21 do_iproute 2217 2193 -24 parse_args 1444 1414 -30 ip_do 47 16 -31 do_iprule 994 963 -31 ip_main 153 113 -40 ipaddr_modify 1357 1305 -52 ipaddr_list_or_flush 2543 2490 -53 ip_parse_common_args 294 159 -135 ------------------------------------------------------------------------------ (add/remove: 4/1 grow/shrink: 4/24 up/down: 85/-563) Total: -478 bytes text data bss dec hex filename 775561 966 9236 785763 bfd63 busybox_old 775073 962 9236 785271 bfb77 busybox_unstripped
Diffstat (limited to 'networking/ip.c')
-rw-r--r--networking/ip.c37
1 files changed, 15 insertions, 22 deletions
diff --git a/networking/ip.c b/networking/ip.c
index 3ea1b62e1..182813d4e 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -24,57 +24,50 @@
24 || ENABLE_FEATURE_IP_TUNNEL \ 24 || ENABLE_FEATURE_IP_TUNNEL \
25 || ENABLE_FEATURE_IP_RULE 25 || ENABLE_FEATURE_IP_RULE
26 26
27static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av) 27static int ATTRIBUTE_NORETURN ip_print_help(char ATTRIBUTE_UNUSED **argv)
28{ 28{
29 bb_show_usage(); 29 bb_show_usage();
30} 30}
31 31
32static int (*ip_func)(int argc, char **argv) = ip_print_help; 32static int ip_do(int (*ip_func)(char **argv), char **argv)
33
34static int ip_do(int argc, char **argv)
35{ 33{
36 ip_parse_common_args(&argc, &argv); 34 argv = ip_parse_common_args(argv);
37 return ip_func(argc-1, argv+1); 35 return ip_func(argv);
38} 36}
39 37
40#if ENABLE_FEATURE_IP_ADDRESS 38#if ENABLE_FEATURE_IP_ADDRESS
41int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 39int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
42int ipaddr_main(int argc, char **argv) 40int ipaddr_main(int argc, char **argv)
43{ 41{
44 ip_func = do_ipaddr; 42 return ip_do(do_ipaddr, argv);
45 return ip_do(argc, argv);
46} 43}
47#endif 44#endif
48#if ENABLE_FEATURE_IP_LINK 45#if ENABLE_FEATURE_IP_LINK
49int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 46int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
50int iplink_main(int argc, char **argv) 47int iplink_main(int argc, char **argv)
51{ 48{
52 ip_func = do_iplink; 49 return ip_do(do_iplink, argv);
53 return ip_do(argc, argv);
54} 50}
55#endif 51#endif
56#if ENABLE_FEATURE_IP_ROUTE 52#if ENABLE_FEATURE_IP_ROUTE
57int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 53int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
58int iproute_main(int argc, char **argv) 54int iproute_main(int argc, char **argv)
59{ 55{
60 ip_func = do_iproute; 56 return ip_do(do_iproute, argv);
61 return ip_do(argc, argv);
62} 57}
63#endif 58#endif
64#if ENABLE_FEATURE_IP_RULE 59#if ENABLE_FEATURE_IP_RULE
65int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 60int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
66int iprule_main(int argc, char **argv) 61int iprule_main(int argc, char **argv)
67{ 62{
68 ip_func = do_iprule; 63 return ip_do(do_iprule, argv);
69 return ip_do(argc, argv);
70} 64}
71#endif 65#endif
72#if ENABLE_FEATURE_IP_TUNNEL 66#if ENABLE_FEATURE_IP_TUNNEL
73int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 67int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
74int iptunnel_main(int argc, char **argv) 68int iptunnel_main(int argc, char **argv)
75{ 69{
76 ip_func = do_iptunnel; 70 return ip_do(do_iptunnel, argv);
77 return ip_do(argc, argv);
78} 71}
79#endif 72#endif
80 73
@@ -97,12 +90,12 @@ int ip_main(int argc, char **argv)
97 USE_FEATURE_IP_RULE(IP_rule,) 90 USE_FEATURE_IP_RULE(IP_rule,)
98 IP_none 91 IP_none
99 }; 92 };
93 int (*ip_func)(char **argv) = ip_print_help;
100 94
101 ip_parse_common_args(&argc, &argv); 95 argv = ip_parse_common_args(argv + 1);
102 if (argc > 1) { 96 if (*argv) {
103 int key = index_in_substrings(keywords, argv[1]); 97 int key = index_in_substrings(keywords, *argv);
104 argc -= 2; 98 argv++;
105 argv += 2;
106#if ENABLE_FEATURE_IP_ADDRESS 99#if ENABLE_FEATURE_IP_ADDRESS
107 if (key == IP_addr) 100 if (key == IP_addr)
108 ip_func = do_ipaddr; 101 ip_func = do_ipaddr;
@@ -124,7 +117,7 @@ int ip_main(int argc, char **argv)
124 ip_func = do_iprule; 117 ip_func = do_iprule;
125#endif 118#endif
126 } 119 }
127 return ip_func(argc, argv); 120 return ip_func(argv);
128} 121}
129 122
130#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */ 123#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */