diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-18 11:40:26 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-10-18 11:40:26 +0200 |
commit | 9ff50b869780aba131dc9b542ccd0f1a3959e920 (patch) | |
tree | a1f65f2a5f8c3aa1d6f51bc15c734f2b3ae46ead /networking/udhcp/files.c | |
parent | b102e12253078e8c0ebdeeb5e1893ea6a025a700 (diff) | |
download | busybox-w32-9ff50b869780aba131dc9b542ccd0f1a3959e920.tar.gz busybox-w32-9ff50b869780aba131dc9b542ccd0f1a3959e920.tar.bz2 busybox-w32-9ff50b869780aba131dc9b542ccd0f1a3959e920.zip |
*: deinline SWAP_xE64 on 32-bit CPUs. Wins !90 bytes both on 32 and 64 bits
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'networking/udhcp/files.c')
-rw-r--r-- | networking/udhcp/files.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c index 68b2085a9..49bcafb9c 100644 --- a/networking/udhcp/files.c +++ b/networking/udhcp/files.c | |||
@@ -11,16 +11,6 @@ | |||
11 | #include "common.h" | 11 | #include "common.h" |
12 | #include "dhcpd.h" | 12 | #include "dhcpd.h" |
13 | 13 | ||
14 | #if BB_LITTLE_ENDIAN | ||
15 | static inline uint64_t hton64(uint64_t v) | ||
16 | { | ||
17 | return SWAP_BE64(v); | ||
18 | } | ||
19 | #else | ||
20 | #define hton64(v) (v) | ||
21 | #endif | ||
22 | #define ntoh64(v) hton64(v) | ||
23 | |||
24 | /* on these functions, make sure your datatype matches */ | 14 | /* on these functions, make sure your datatype matches */ |
25 | static int FAST_FUNC read_str(const char *line, void *arg) | 15 | static int FAST_FUNC read_str(const char *line, void *arg) |
26 | { | 16 | { |
@@ -140,7 +130,7 @@ void FAST_FUNC write_leases(void) | |||
140 | 130 | ||
141 | curr = written_at = time(NULL); | 131 | curr = written_at = time(NULL); |
142 | 132 | ||
143 | written_at = hton64(written_at); | 133 | written_at = SWAP_BE64(written_at); |
144 | full_write(fd, &written_at, sizeof(written_at)); | 134 | full_write(fd, &written_at, sizeof(written_at)); |
145 | 135 | ||
146 | for (i = 0; i < server_config.max_leases; i++) { | 136 | for (i = 0; i < server_config.max_leases; i++) { |
@@ -190,7 +180,7 @@ void FAST_FUNC read_leases(const char *file) | |||
190 | 180 | ||
191 | if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at)) | 181 | if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at)) |
192 | goto ret; | 182 | goto ret; |
193 | written_at = ntoh64(written_at); | 183 | written_at = SWAP_BE64(written_at); |
194 | 184 | ||
195 | time_passed = time(NULL) - written_at; | 185 | time_passed = time(NULL) - written_at; |
196 | /* Strange written_at, or lease file from old version of udhcpd | 186 | /* Strange written_at, or lease file from old version of udhcpd |