From: Frode Solheim <frode-code@fengestad.no>
Date: Tue, 29 Jul 2014 21:26:52 +0000 (+0200)
Subject: slirp: minor changes to fix compiler warnings
X-Git-Tag: 3000~96^2
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=c6a184029c6f8755dfb0cf0d4936a0b9190704af;p=francis%2Fwinuae.git

slirp: minor changes to fix compiler warnings
---

diff --git a/slirp/ip_icmp.cpp b/slirp/ip_icmp.cpp
index 2dfef009..65becfe7 100644
--- 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 19650abf..e49d2d2e 100644
--- 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 dc47d06e..574e2ba0 100644
--- 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 dc9029f6..372ae3b9 100644
--- 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 4b53b554..ea1c69e7 100644
--- 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",