emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: deinline SWAP_xE64 on 32-bit CPUs. Wins !90 bytes both on 32 and 64 bits

Browse Source 
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Denys Vlasenko
2010-10-18 11:40:26 +02:00
parent b102e12253
commit 9ff50b8697
7 changed files with 37 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
networking/udhcp/dumpleases.c
View File

@@ -6,17 +6,6 @@
#include "dhcpd.h"
#include "unicode.h"
#if BB_LITTLE_ENDIAN
static inline uint64_t hton64(uint64_t v)
{
return SWAP_BE64(v);
}
#else
#define hton64(v) (v)
#endif
#define ntoh64(v) hton64(v)
int dumpleases_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int dumpleases_main(int argc UNUSED_PARAM, char **argv)
{
@@ -54,7 +43,7 @@ int dumpleases_main(int argc UNUSED_PARAM, char **argv)
/* "123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 */
xread(fd, &written_at, sizeof(written_at));
written_at = ntoh64(written_at);
written_at = SWAP_BE64(written_at);
curr = time(NULL);
if (curr < written_at)
written_at = curr; /* lease file from future! :) */

14
networking/udhcp/files.c
View File

@@ -11,16 +11,6 @@
#include "common.h"
#include "dhcpd.h"
#if BB_LITTLE_ENDIAN
static inline uint64_t hton64(uint64_t v)
{
return SWAP_BE64(v);
}
#else
#define hton64(v) (v)
#endif
#define ntoh64(v) hton64(v)
/* on these functions, make sure your datatype matches */
static int FAST_FUNC read_str(const char *line, void *arg)
{
@@ -140,7 +130,7 @@ void FAST_FUNC write_leases(void)
curr = written_at = time(NULL);
written_at = hton64(written_at);
written_at = SWAP_BE64(written_at);
full_write(fd, &written_at, sizeof(written_at));
for (i = 0; i < server_config.max_leases; i++) {
@@ -190,7 +180,7 @@ void FAST_FUNC read_leases(const char *file)
if (full_read(fd, &written_at, sizeof(written_at)) != sizeof(written_at))
goto ret;
written_at = ntoh64(written_at);
written_at = SWAP_BE64(written_at);
time_passed = time(NULL) - written_at;
/* Strange written_at, or lease file from old version of udhcpd