gwj / at91sam9263 · Commits

Commit 8ec7f4edcfcca6ef5d197f1d9323137ece5f7a89

Authored by Jan Kiszka
Committed by Anthony Liguori
1 parent 285f7a62

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>
Inline Side-by-side
Showing 2 changed files with 5 additions and 9 deletions
slirp/main.h
  View file @8ec7f4e
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 11
12 #define TOWRITEMAX 512 12 #define TOWRITEMAX 512
13 13
14 -extern struct timeval tt;  
15 extern int link_up; 14 extern int link_up;
16 extern int slirp_socket; 15 extern int slirp_socket;
17 extern int slirp_socket_unit; 16 extern int slirp_socket_unit;
slirp/slirp.c
  View file @8ec7f4e
@@ -54,7 +54,6 @@ static const uint8_t zero_ethaddr[6] = { 0, 0, 0, 0, 0, 0 }; @@ -54,7 +54,6 @@ static const uint8_t zero_ethaddr[6] = { 0, 0, 0, 0, 0, 0 };
54 int slirp_restrict; 54 int slirp_restrict;
55 static int do_slowtimo; 55 static int do_slowtimo;
56 int link_up; 56 int link_up;
57 -struct timeval tt;  
58 struct ex_list *exec_list; 57 struct ex_list *exec_list;
59 58
60 /* XXX: suppress those select globals */ 59 /* XXX: suppress those select globals */
@@ -250,19 +249,17 @@ static void updtime(void) @@ -250,19 +249,17 @@ static void updtime(void)
250 struct _timeb tb; 249 struct _timeb tb;
251 250
252 _ftime(&tb); 251 _ftime(&tb);
253 - curtime = (u_int)tb.time * (u_int)1000;  
254 - curtime += (u_int)tb.millitm; 252 +
  253 + curtime = tb.time * 1000 + tb.millitm;
255 } 254 }
256 #else 255 #else
257 static void updtime(void) 256 static void updtime(void)
258 { 257 {
259 - gettimeofday(&tt, NULL); 258 + struct timeval tv;
260 259
261 - curtime = (u_int)tt.tv_sec * (u_int)1000;  
262 - curtime += (u_int)tt.tv_usec / (u_int)1000; 260 + gettimeofday(&tv, NULL);
263 261
264 - if ((tt.tv_usec % 1000) >= 500)  
265 - curtime++; 262 + curtime = tv.tv_sec * 1000 + tv.tv_usec / 1000;
266 } 263 }
267 #endif 264 #endif
268 265