[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 8ec7f4e] slirp: Clean up updtime
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 8ec7f4e] slirp: Clean up updtime |
Date: |
Tue, 30 Jun 2009 00:57:31 -0000 |
From: Jan Kiszka <address@hidden>
Drop redundant typecasts in both variants and remove the pointless
round-up in the UNIX version.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/slirp/main.h b/slirp/main.h
index 891220a..6fd38f9 100644
--- a/slirp/main.h
+++ b/slirp/main.h
@@ -11,7 +11,6 @@
#define TOWRITEMAX 512
-extern struct timeval tt;
extern int link_up;
extern int slirp_socket;
extern int slirp_socket_unit;
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 02f6fe5..20c691f 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 8ec7f4e] slirp: Clean up updtime,
Anthony Liguori <=