[Qemu-devel] [6272] Fix some SLIRP warnings

[Blue Swirl]

Revision: 6272
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6272
Author:   blueswir1
Date:     2009-01-12 17:51:06 +0000 (Mon, 12 Jan 2009)

Log Message:
-----------
Fix some SLIRP warnings

Modified Paths:
--------------
    trunk/slirp/main.h
    trunk/slirp/slirp.c
    trunk/slirp/tcp_subr.c

Modified: trunk/slirp/main.h
===================================================================
--- trunk/slirp/main.h  2009-01-12 17:40:23 UTC (rev 6271)
+++ trunk/slirp/main.h  2009-01-12 17:51:06 UTC (rev 6272)
@@ -44,7 +44,7 @@
 extern int ppp_exit;
 extern int tcp_keepintvl;
 extern uint8_t client_ethaddr[6];
-extern char *slirp_special_ip;
+extern const char *slirp_special_ip;
 extern int slirp_restrict;
 
 #define PROTO_SLIP 0x1

Modified: trunk/slirp/slirp.c
===================================================================
--- trunk/slirp/slirp.c 2009-01-12 17:40:23 UTC (rev 6271)
+++ trunk/slirp/slirp.c 2009-01-12 17:51:06 UTC (rev 6272)
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
+#include "qemu-char.h"
 #include "slirp.h"
 #include "hw/hw.h"
 
@@ -47,7 +48,7 @@
 
 static const uint8_t zero_ethaddr[6] = { 0, 0, 0, 0, 0, 0 };
 
-char *slirp_special_ip = CTL_SPECIAL;
+const char *slirp_special_ip = CTL_SPECIAL;
 int slirp_restrict;
 int do_slowtimo;
 int link_up;
@@ -809,7 +810,7 @@
     if (!so)
         return;
 
-    ret = soreadbuf(so, buf, size);
+    ret = soreadbuf(so, (const char *)buf, size);
 
     if (ret > 0)
         tcp_output(sototcpcb(so));
@@ -1031,7 +1032,7 @@
         if (!ex_ptr)
             return -EINVAL;
 
-        so->extra = ex_ptr->ex_exec;
+        so->extra = (void *)ex_ptr->ex_exec;
     }
 
     return 0;

Modified: trunk/slirp/tcp_subr.c
===================================================================
--- trunk/slirp/tcp_subr.c      2009-01-12 17:40:23 UTC (rev 6271)
+++ trunk/slirp/tcp_subr.c      2009-01-12 17:51:06 UTC (rev 6272)
@@ -1283,7 +1283,7 @@
                            command == ex_ptr->ex_addr) {
                                if (ex_ptr->ex_pty == 3) {
                                        so->s = -1;
-                                       so->extra = ex_ptr->ex_exec;
+                                       so->extra = (void *)ex_ptr->ex_exec;
                                        return 1;
                                }
                                do_pty = ex_ptr->ex_pty;