diff options
| author | Denis Vlasenko | 2007-07-03 15:47:50 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2007-07-03 15:47:50 +0000 |
| commit | 42b3dea9bfb8ac595c71089ee23012f44dd43eb2 (patch) | |
| tree | b7b86d06a574d2af72bc79536d399905b5619959 /networking/udhcp/files.c | |
| parent | 54e19da86d5496ec5f5787b85a2b6342be1d63d4 (diff) | |
| download | busybox-42b3dea9bfb8ac595c71089ee23012f44dd43eb2.zip busybox-42b3dea9bfb8ac595c71089ee23012f44dd43eb2.tar.gz | |
udhcp: many small fixes:
* arpping(): smaller and even probably fixed
* lots of variables/params converted: ulong -> uint32_t
* uptime() nuked in favor of monotonic_sec()
* udhcp_get_packet(): only one "bad vendor", simplify
function old new delta
reservedIp 36 35 -1
udhcpc_main 2462 2460 -2
addStaticLease 64 62 -2
static.broken_vendors 16 - -16
uptime 19 - -19
udhcpd_main 1273 1238 -35
udhcp_get_packet 223 184 -39
.rodata 144162 144106 -56
arpping 690 609 -81
------------------------------------------------------------------------------
(add/remove: 0/2 grow/shrink: 0/7 up/down: 0/-251) Total: -251 bytes
text data bss dec hex filename
734241 3028 14400 751669 b7835 busybox_old
734005 3028 14400 751433 b7749 busybox_unstripped
Diffstat (limited to 'networking/udhcp/files.c')
| -rw-r--r-- | networking/udhcp/files.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index 7fc7348..8ed4855 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c @@ -17,12 +17,11 @@ static int read_ip(const char *line, void *arg) len_and_sockaddr *lsa; lsa = host_and_af2sockaddr(line, 0, AF_INET); - if (lsa) { - *(uint32_t*)arg = lsa->sin.sin_addr.s_addr; - free(lsa); - return 1; - } - return 0; + if (!lsa) + return 0; + *(uint32_t*)arg = lsa->sin.sin_addr.s_addr; + free(lsa); + return 1; } static int read_mac(const char *line, void *arg) |