diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-07 15:10:29 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-06-07 15:10:29 +0000 |
commit | 53354ac47df03bdccebad66bc22958fa2b4da520 (patch) | |
tree | b3d85b6cd19f81293848235560b24cbce86f77d7 /networking/libiproute | |
parent | f0d6c255860509b10148c70ef7cb518eb81bea6d (diff) | |
download | busybox-w32-53354ac47df03bdccebad66bc22958fa2b4da520.tar.gz busybox-w32-53354ac47df03bdccebad66bc22958fa2b4da520.tar.bz2 busybox-w32-53354ac47df03bdccebad66bc22958fa2b4da520.zip |
libbb: introduce and use print_flags().
Mostly by Natanael Copa <natanael.copa AT gmail.com>
function old new delta
print_e2flags - 189 +189
print_flags_separated - 86 +86
static.flag_labels - 60 +60
static.dma_wmode_masks - 32 +32
static.flag_masks - 28 +28
static.arp_labels - 16 +16
static.arp_masks - 12 +12
ls_main 836 843 +7
...
popstring 140 134 -6
arp_show 740 708 -32
print_flags 189 25 -164
ipaddr_list_or_flush 2396 2170 -226
process_dev 5306 4706 -600
------------------------------------------------------------------------------
(add/remove: 10/0 grow/shrink: 5/10 up/down: 458/-1043) Total: -585 bytes
text data bss dec hex filename
810564 624 7060 818248 c7c48 busybox_old
810002 624 7060 817686 c7a16 busybox_unstripped
Diffstat (limited to 'networking/libiproute')
-rw-r--r-- | networking/libiproute/ipaddress.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c index 07b27870d..faa3f2d06 100644 --- a/networking/libiproute/ipaddress.c +++ b/networking/libiproute/ipaddress.c | |||
@@ -45,16 +45,15 @@ typedef struct filter_t { | |||
45 | 45 | ||
46 | static void print_link_flags(unsigned flags, unsigned mdown) | 46 | static void print_link_flags(unsigned flags, unsigned mdown) |
47 | { | 47 | { |
48 | static const int flag_masks[] = { | ||
49 | IFF_LOOPBACK, IFF_BROADCAST, IFF_POINTOPOINT, | ||
50 | IFF_MULTICAST, IFF_NOARP, IFF_UP, IFF_LOWER_UP }; | ||
51 | static const char flag_labels[] ALIGN1 = | ||
52 | "LOOPBACK\0""BROADCAST\0""POINTOPOINT\0" | ||
53 | "MULTICAST\0""NOARP\0""UP\0""LOWER_UP\0"; | ||
54 | |||
48 | bb_putchar('<'); | 55 | bb_putchar('<'); |
49 | flags &= ~IFF_RUNNING; | 56 | flags &= ~IFF_RUNNING; |
50 | #define _PF(f) if (flags & IFF_##f) { \ | ||
51 | flags &= ~IFF_##f; \ | ||
52 | printf(#f "%s", flags ? "," : ""); } | ||
53 | _PF(LOOPBACK); | ||
54 | _PF(BROADCAST); | ||
55 | _PF(POINTOPOINT); | ||
56 | _PF(MULTICAST); | ||
57 | _PF(NOARP); | ||
58 | #if 0 | 57 | #if 0 |
59 | _PF(ALLMULTI); | 58 | _PF(ALLMULTI); |
60 | _PF(PROMISC); | 59 | _PF(PROMISC); |
@@ -66,9 +65,7 @@ static void print_link_flags(unsigned flags, unsigned mdown) | |||
66 | _PF(PORTSEL); | 65 | _PF(PORTSEL); |
67 | _PF(NOTRAILERS); | 66 | _PF(NOTRAILERS); |
68 | #endif | 67 | #endif |
69 | _PF(UP); | 68 | flags = print_flags_separated(flag_masks, flag_labels, flags, ","); |
70 | _PF(LOWER_UP); | ||
71 | #undef _PF | ||
72 | if (flags) | 69 | if (flags) |
73 | printf("%x", flags); | 70 | printf("%x", flags); |
74 | if (mdown) | 71 | if (mdown) |