diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-07-14 22:07:14 +0000 |
| commit | fb79a2e2cfe33002398f1898c26d8e4f341db006 (patch) | |
| tree | f5b3ee27db5bc8c9b181fbec171f8fa430a75ba5 /networking/udhcp | |
| parent | fcfaf2e18aba06dd90b16958ecfbfcfbf59ceb02 (diff) | |
| download | busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.gz busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.tar.bz2 busybox-w32-fb79a2e2cfe33002398f1898c26d8e4f341db006.zip | |
xioctl and friends by Tito <farmatito@tiscali.it>
function old new delta
do_iptunnel 203 977 +774
process_dev 5328 5494 +166
ioctl_or_perror - 54 +54
ioctl_or_perror_and_die - 51 +51
ioctl_alt_func - 49 +49
bb_ioctl_or_warn - 47 +47
do_add_ioctl 102 145 +43
bb_xioctl - 39 +39
print_value_on_off - 31 +31
get_lcm 105 123 +18
arp_main 2155 2167 +12
..................
zcip_main 1576 1566 -10
setlogcons_main 92 82 -10
dumpkmap_main 263 253 -10
do_get_ioctl 85 75 -10
setkeycodes_main 165 154 -11
write_table 244 232 -12
vconfig_main 318 306 -12
do_del_ioctl 93 81 -12
set_address 75 62 -13
maybe_set_utc 30 16 -14
loadfont_main 495 479 -16
slattach_main 712 695 -17
do_loadfont 191 174 -17
do_iplink 1155 1136 -19
getty_main 2583 2562 -21
fbset_main 2058 2035 -23
do_time 588 565 -23
xioctl 25 - -25
read_rtc 186 160 -26
parse_conf 1299 1270 -29
udhcp_read_interface 269 239 -30
bb_ioctl 45 - -45
bb_ioctl_alt 70 - -70
bb_ioctl_on_off 78 - -78
.rodata 129370 129018 -352
do_show 799 - -799
------------------------------------------------------------------------------
(add/remove: 6/5 grow/shrink: 13/49 up/down: 1316/-1864) Total: -548 bytes
text data bss dec hex filename
675352 2740 13968 692060 a8f5c busybox_old
674804 2740 13968 691512 a8d38 busybox_unstripped
Diffstat (limited to 'networking/udhcp')
| -rw-r--r-- | networking/udhcp/socket.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/networking/udhcp/socket.c b/networking/udhcp/socket.c index be5985f88..21a058545 100644 --- a/networking/udhcp/socket.c +++ b/networking/udhcp/socket.c | |||
| @@ -53,9 +53,9 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t | |||
| 53 | ifr.ifr_addr.sa_family = AF_INET; | 53 | ifr.ifr_addr.sa_family = AF_INET; |
| 54 | strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); | 54 | strncpy(ifr.ifr_name, interface, sizeof(ifr.ifr_name)); |
| 55 | if (addr) { | 55 | if (addr) { |
| 56 | if (ioctl(fd, SIOCGIFADDR, &ifr) != 0) { | 56 | if (ioctl_or_perror(fd, SIOCGIFADDR, &ifr, |
| 57 | bb_perror_msg("SIOCGIFADDR failed (is interface %s " | 57 | "is interface %s up and configured?", interface) |
| 58 | "up and configured?)", interface); | 58 | ) { |
| 59 | close(fd); | 59 | close(fd); |
| 60 | return -1; | 60 | return -1; |
| 61 | } | 61 | } |
| @@ -65,8 +65,7 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t | |||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | if (ifindex) { | 67 | if (ifindex) { |
| 68 | if (ioctl(fd, SIOCGIFINDEX, &ifr) != 0) { | 68 | if (ioctl_or_warn(fd, SIOCGIFINDEX, &ifr) != 0) { |
| 69 | bb_perror_msg("SIOCGIFINDEX failed"); | ||
| 70 | close(fd); | 69 | close(fd); |
| 71 | return -1; | 70 | return -1; |
| 72 | } | 71 | } |
| @@ -75,8 +74,7 @@ int read_interface(const char *interface, int *ifindex, uint32_t *addr, uint8_t | |||
| 75 | } | 74 | } |
| 76 | 75 | ||
| 77 | if (arp) { | 76 | if (arp) { |
| 78 | if (ioctl(fd, SIOCGIFHWADDR, &ifr) != 0) { | 77 | if (ioctl_or_warn(fd, SIOCGIFHWADDR, &ifr) != 0) { |
| 79 | bb_perror_msg("SIOCGIFHWADDR failed"); | ||
| 80 | close(fd); | 78 | close(fd); |
| 81 | return -1; | 79 | return -1; |
| 82 | } | 80 | } |