diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-13 15:43:28 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-01-13 15:43:28 +0000 |
commit | c44c21060e47a50090206b23ff4de8fe13e8e521 (patch) | |
tree | b55f7227f470e1ae87e24a89f0ce37aaae257961 | |
parent | ce34cccf28d3b46defbc048f8748d0c870ac3178 (diff) | |
download | busybox-w32-c44c21060e47a50090206b23ff4de8fe13e8e521.tar.gz busybox-w32-c44c21060e47a50090206b23ff4de8fe13e8e521.tar.bz2 busybox-w32-c44c21060e47a50090206b23ff4de8fe13e8e521.zip |
- save four bytes by manually hoisting the br assignment
-rw-r--r-- | networking/brctl.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/networking/brctl.c b/networking/brctl.c index 21d528f91..5255a552f 100644 --- a/networking/brctl.c +++ b/networking/brctl.c | |||
@@ -35,6 +35,7 @@ int brctl_main(int argc, char **argv) | |||
35 | USE_FEATURE_BRCTL_SHOW(, ARG_show) }; | 35 | USE_FEATURE_BRCTL_SHOW(, ARG_show) }; |
36 | smalluint key; | 36 | smalluint key; |
37 | static char info[] = BRCTL_VERBOSE("%s ")"bridge %s\0 iface %s"; | 37 | static char info[] = BRCTL_VERBOSE("%s ")"bridge %s\0 iface %s"; |
38 | char *br; | ||
38 | 39 | ||
39 | argv++; | 40 | argv++; |
40 | while (*argv) { | 41 | while (*argv) { |
@@ -51,10 +52,9 @@ int brctl_main(int argc, char **argv) | |||
51 | #endif | 52 | #endif |
52 | BRCTL_VERBOSE(op = (char*)((key % 2) ? "add" : "del");) | 53 | BRCTL_VERBOSE(op = (char*)((key % 2) ? "add" : "del");) |
53 | fd = xsocket(AF_INET, SOCK_STREAM, 0); | 54 | fd = xsocket(AF_INET, SOCK_STREAM, 0); |
54 | if (key < 3) {/* addbr or delbr */ | 55 | br = *(argv++); |
55 | char *br; | ||
56 | 56 | ||
57 | br = *(argv++); | 57 | if (key < 3) { /* addbr or delbr */ |
58 | if (ioctl(fd, key == ARG_addbr ? SIOCBRADDBR : SIOCBRDELBR, br) < 0) | 58 | if (ioctl(fd, key == ARG_addbr ? SIOCBRADDBR : SIOCBRDELBR, br) < 0) |
59 | { | 59 | { |
60 | info[9 BRCTL_VERBOSE(+3)] = '\0'; | 60 | info[9 BRCTL_VERBOSE(+3)] = '\0'; |
@@ -63,9 +63,8 @@ int brctl_main(int argc, char **argv) | |||
63 | } | 63 | } |
64 | if (key > 2) { /* addif or delif */ | 64 | if (key > 2) { /* addif or delif */ |
65 | struct ifreq ifr; | 65 | struct ifreq ifr; |
66 | char *br, *brif; | 66 | char *brif; |
67 | 67 | ||
68 | br = *(argv++); | ||
69 | if (!*argv) | 68 | if (!*argv) |
70 | bb_show_usage(); | 69 | bb_show_usage(); |
71 | brif = *(argv++); | 70 | brif = *(argv++); |