diff options
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/ip_icmp.c | 8 | ||||
| -rw-r--r-- | slirp/ip_icmp.h | 3 | ||||
| -rw-r--r-- | slirp/misc.c | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/slirp/ip_icmp.c b/slirp/ip_icmp.c index 53566c1f71..2514f9f831 100644 --- a/slirp/ip_icmp.c +++ b/slirp/ip_icmp.c @@ -207,12 +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; +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 8c9b5a1ba5..5cd9f7ffc4 100644 --- a/slirp/ip_icmp.h +++ b/slirp/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/slirp/misc.c b/slirp/misc.c index 032a1f7b1f..3d921dfe02 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -307,7 +307,7 @@ 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 @@ -411,7 +411,7 @@ 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 */ { |