diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-01-28 00:20:46 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-01-28 00:20:46 +0000 |
| commit | 4d9a358ec1dbed52852cf7031ae0e04f31ca3753 (patch) | |
| tree | ea2fc40bf5857a7c92535df53b267b25cf45549f | |
| parent | 6912ea146755c9ec5dddc20ec1c8e32c2d32cd82 (diff) | |
| download | busybox-w32-4d9a358ec1dbed52852cf7031ae0e04f31ca3753.tar.gz busybox-w32-4d9a358ec1dbed52852cf7031ae0e04f31ca3753.tar.bz2 busybox-w32-4d9a358ec1dbed52852cf7031ae0e04f31ca3753.zip | |
- use uint32_t as suggested by vda.
- minor size- and readability tweaks while at it:
text data bss dec hex filename
2631 0 0 2631 a47 networking/libiproute/iprule.o.orig
2596 0 0 2596 a24 networking/libiproute/iprule.o
| -rw-r--r-- | networking/libiproute/iprule.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/networking/libiproute/iprule.c b/networking/libiproute/iprule.c index abc0e7a85..bf660b053 100644 --- a/networking/libiproute/iprule.c +++ b/networking/libiproute/iprule.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | * Changes: | 13 | * Changes: |
| 14 | * | 14 | * |
| 15 | * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses | 15 | * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses |
| 16 | * initially integrated into busybox by Bernhard Fischer | ||
| 16 | */ | 17 | */ |
| 17 | 18 | ||
| 18 | #include "libbb.h" | 19 | #include "libbb.h" |
| @@ -168,7 +169,8 @@ static int iprule_list(int argc, char **argv) | |||
| 168 | af = AF_INET; | 169 | af = AF_INET; |
| 169 | 170 | ||
| 170 | if (argc > 0) { | 171 | if (argc > 0) { |
| 171 | bb_error_msg("\"rule show\" needs no arguments"); | 172 | //bb_error_msg("\"rule show\" needs no arguments"); |
| 173 | bb_warn_ignoring_args(argc); | ||
| 172 | return -1; | 174 | return -1; |
| 173 | } | 175 | } |
| 174 | 176 | ||
| @@ -256,7 +258,7 @@ static int iprule_modify(int cmd, int argc, char **argv) | |||
| 256 | addattr32(&req.n, sizeof(req), RTA_FLOW, realm); | 258 | addattr32(&req.n, sizeof(req), RTA_FLOW, realm); |
| 257 | } else if (matches(*argv, "table") == 0 || | 259 | } else if (matches(*argv, "table") == 0 || |
| 258 | strcmp(*argv, "lookup") == 0) { | 260 | strcmp(*argv, "lookup") == 0) { |
| 259 | unsigned int tid; | 261 | uint32_t tid; |
| 260 | NEXT_ARG(); | 262 | NEXT_ARG(); |
| 261 | if (rtnl_rttable_a2n(&tid, *argv)) | 263 | if (rtnl_rttable_a2n(&tid, *argv)) |
| 262 | invarg("table ID", *argv); | 264 | invarg("table ID", *argv); |
| @@ -304,16 +306,16 @@ static int iprule_modify(int cmd, int argc, char **argv) | |||
| 304 | 306 | ||
| 305 | int do_iprule(int argc, char **argv) | 307 | int do_iprule(int argc, char **argv) |
| 306 | { | 308 | { |
| 307 | static const char * const ip_rule_commands[] = | 309 | const char * const ip_rule_commands[] = |
| 308 | {"add", "delete", "list", "show", 0}; | 310 | {"add", "delete", "list", "show", 0}; |
| 309 | int command_num = 2; | 311 | int cmd = 2; /* list */ |
| 310 | int cmd; | ||
| 311 | 312 | ||
| 312 | if (argc < 1) | 313 | if (argc < 1) |
| 313 | return iprule_list(0, NULL); | 314 | return iprule_list(0, NULL); |
| 314 | if (*argv) | 315 | if (*argv) |
| 315 | command_num = index_in_substr_array(ip_rule_commands, *argv); | 316 | cmd = index_in_substr_array(ip_rule_commands, *argv); |
| 316 | switch (command_num) { | 317 | |
| 318 | switch (cmd) { | ||
| 317 | case 0: /* add */ | 319 | case 0: /* add */ |
| 318 | cmd = RTM_NEWRULE; | 320 | cmd = RTM_NEWRULE; |
| 319 | break; | 321 | break; |
