slirp: minor changes to fix compiler warnings

diff --git a/slirp/ip_icmp.cpp b/slirp/ip_icmp.cpp
index 2dfef009ca504652135fc1715f5b627f256e243f..65becfe743fdd978bfe6077906f339bb05e6f274 100644 (file)
--- a/slirp/ip_icmp.cpp
+++ b/slirp/ip_icmp.cpp
@@ -254,7 +254,7 @@ end_error:
  */
 
 #define ICMP_MAXDATALEN (IP_MSS-28)
-void icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize, char *message)
+void icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize, const char *message)
 {
   unsigned hlen, shlen, s_ip_len;
   register struct ip *ip;

diff --git a/slirp/ip_icmp.h b/slirp/ip_icmp.h
index 19650abf268d484f33adcdf1743461a507674810..e49d2d2ebebd1bc99fa931a271d10393a3cc8580 100644 (file)
--- a/slirp/ip_icmp.h
+++ b/slirp/ip_icmp.h
@@ -158,7 +158,7 @@ struct icmp {
 void icmp_init(void);
 void icmp_cleanup(void);
 void icmp_input _P((struct mbuf *, int));
-void icmp_error _P((struct mbuf *, u_char, u_char, int, char *));
+void icmp_error _P((struct mbuf *, u_char, u_char, int, const char *));
 void icmp_reflect _P((struct mbuf *));
 void icmp_receive(struct socket *so);
 void icmp_detach(struct socket *so);

diff --git a/slirp/misc.cpp b/slirp/misc.cpp
index dc47d06e8c05c868e56fafc2a64fdbe6574bd9b5..574e2ba02e1df7f714f5411c76a9131cbb851b29 100644 (file)
--- a/slirp/misc.cpp
+++ b/slirp/misc.cpp
@@ -380,8 +380,8 @@ fork_exec(struct socket *so, char *ex, int do_pty)
                bptr = strdup(ex); /* No need to free() this */
                if (do_pty == 1) {
                        /* Setup "slirp.telnetd -x" */
-                       argv[i++] = "slirp.telnetd";
-                       argv[i++] = "-x";
+                       argv[i++] = strdup("slirp.telnetd");
+                       argv[i++] = strdup("-x");
                        argv[i++] = bptr;
                } else
                   do {

diff --git a/slirp/tcp.h b/slirp/tcp.h
index dc9029f6ca60b7e54ffd9245c3a7ac81f3f84cb8..372ae3b948e5a17e96a389253f7a8bf88377c11a 100644 (file)
--- a/slirp/tcp.h
+++ b/slirp/tcp.h
@@ -170,6 +170,6 @@ struct tcphdr {
 
 extern tcp_seq tcp_iss;                /* tcp initial send seq # */
 
-extern char *tcpstates[];
+extern const char *tcpstates[];
 
 #endif

diff --git a/slirp/tcp_output.cpp b/slirp/tcp_output.cpp
index 4b53b5544a583641bd39499c12e3eca8e852f2a2..ea1c69e702c219095bdd0b46822e5b3d57f42a54 100644 (file)
--- a/slirp/tcp_output.cpp
+++ b/slirp/tcp_output.cpp
@@ -44,7 +44,7 @@
  * Since this is only used in "stats socket", we give meaning
  * names instead of the REAL names
  */
-char *tcpstates[] = {
+const char *tcpstates[] = {
 /*     "CLOSED",       "LISTEN",       "SYN_SENT",     "SYN_RCVD", */
        "REDIRECT",     "LISTEN",       "SYN_SENT",     "SYN_RCVD",
        "ESTABLISHED",  "CLOSE_WAIT",   "FIN_WAIT_1",   "CLOSING",