Fix warnings that would be caused by gcc flag -Wwrite-strings

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5206 c046a42c-6fe2-441c-8c8c-71466251a162

3 files changed, 6 insertions, 8 deletions

diff --git a/ip_icmp.c b/ip_icmp.c
index cd38ab0..658a432 100644
--- a/ip_icmp.c
+++ b/ip_icmp.c
@@ -207,11 +207,8 @@ end_error:
  */
 
 #define ICMP_MAXDATALEN (IP_MSS - 28)
-void icmp_error(msrc, type, code, minsize, message) 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/ip_icmp.h b/ip_icmp.h
index 9148593..81c9e5c 100644
--- a/ip_icmp.h
+++ b/ip_icmp.h
@@ -158,7 +158,8 @@ struct icmp {
      (type) == ICMP_MASKREQ || (type) == ICMP_MASKREPLY)
 
 void icmp_input _P((struct mbuf *, int));
-void icmp_error _P((struct mbuf *, u_char, u_char, int, char *));
+void icmp_error(struct mbuf *msrc, u_char type, u_char code, int minsize,
+                const char *message);
 void icmp_reflect _P((struct mbuf *));
 
 #endif
diff --git a/misc.c b/misc.c
index deae6a9..6b65399 100644
--- a/misc.c
+++ b/misc.c
@@ -284,7 +284,7 @@ int fork_exec(struct socket *so, const char *ex, int do_pty)
     socklen_t addrlen = sizeof(addr);
     int opt;
     int master = -1;
-    char *argv[256];
+    const char *argv[256];
 #if 0
 	char buff[256];
 #endif
@@ -388,7 +388,7 @@ int fork_exec(struct socket *so, const char *ex, int do_pty)
             } while (c);
 
         argv[i] = 0;
-        execvp(argv[0], argv);
+        execvp(argv[0], (char **)argv);
 
         /* Ooops, failed, let's tell the user why */
         {