Sparse fixes: NULL use, header order, ANSI prototypes, static

[qemu] / slirp / slirp.c

diff --git a/slirp/slirp.c b/slirp/slirp.c
index 0394496..4ca35b2 100644 (file)
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -50,7 +50,7 @@ static const uint8_t zero_ethaddr[6] = { 0, 0, 0, 0, 0, 0 };
 
 const char *slirp_special_ip = CTL_SPECIAL;
 int slirp_restrict;
-int do_slowtimo;
+static int do_slowtimo;
 int link_up;
 struct timeval tt;
 FILE *lfd;
@@ -171,7 +171,7 @@ static void slirp_cleanup(void)
 static void slirp_state_save(QEMUFile *f, void *opaque);
 static int slirp_state_load(QEMUFile *f, void *opaque, int version_id);
 
-void slirp_init(int restrict, char *special_ip)
+void slirp_init(int restricted, char *special_ip)
 {
     //    debug_init("/tmp/slirp.log", DEBUG_DEFAULT);
 
@@ -184,7 +184,7 @@ void slirp_init(int restrict, char *special_ip)
 #endif
 
     link_up = 1;
-    slirp_restrict = restrict;
+    slirp_restrict = restricted;
 
     if_init();
     ip_init();
@@ -228,7 +228,7 @@ static void updtime(void)
 #else
 static void updtime(void)
 {
-       gettimeofday(&tt, 0);
+        gettimeofday(&tt, NULL);
 
        curtime = (u_int)tt.tv_sec * (u_int)1000;
        curtime += (u_int)tt.tv_usec / (u_int)1000;