OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

slirp: Clean up updtime 

Drop redundant typecasts in both variants and remove the pointless
round-up in the UNIX version.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-06-24 14:42:30 +02:00 committed by Anthony Liguori
parent 285f7a62e4
commit 8ec7f4edcf
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
slirp/main.h
View File

@ -11,7 +11,6 @@
#define TOWRITEMAX 512
extern struct timeval tt;
extern int link_up;
extern int slirp_socket;
extern int slirp_socket_unit;

13
slirp/slirp.c
View File

@ -54,7 +54,6 @@ static const uint8_t zero_ethaddr[6] = { 0, 0, 0, 0, 0, 0 };
int slirp_restrict;
static int do_slowtimo;
int link_up;
struct timeval tt;
struct ex_list *exec_list;
/* XXX: suppress those select globals */
@ -250,19 +249,17 @@ static void updtime(void)
struct _timeb tb;
_ftime(&tb);
curtime = (u_int)tb.time * (u_int)1000;
curtime += (u_int)tb.millitm;
curtime = tb.time * 1000 + tb.millitm;
}
#else
static void updtime(void)
{
gettimeofday(&tt, NULL);
struct timeval tv;
curtime = (u_int)tt.tv_sec * (u_int)1000;
curtime += (u_int)tt.tv_usec / (u_int)1000;
gettimeofday(&tv, NULL);
if ((tt.tv_usec % 1000) >= 500)
curtime++;
curtime = tv.tv_sec * 1000 + tv.tv_usec / 1000;
}
#endif