--- previous/src/slirp/misc.c 2018/04/24 19:32:44 1.1.1.2 +++ previous/src/slirp/misc.c 2018/04/24 19:34:33 1.1.1.3 @@ -99,7 +99,7 @@ static char *inet_ntop4(const u_char *sr char tmp[sizeof "255.255.255.255"]; int l; - l = snprintf( tmp, fmt, src[0], src[1], src[2], src[3] ); + l = snprintf( tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3] ); if (l <= 0 || (socklen_t) l >= size) { return (NULL); } @@ -107,11 +107,11 @@ static char *inet_ntop4(const u_char *sr return (dst); } -char * inet_ntop(int af, const void *src, char *dst, socklen_t size) +const char * inet_ntop(int af, const void *src, char *dst, socklen_t size) { switch (af) { case AF_INET: - return (inet_ntop4( (unsigned char*)src, (char*)dst, size)); + return (inet_ntop4( (const unsigned char*)src, (char*)dst, size)); default: return 0 ; } @@ -169,7 +169,7 @@ void redir_x(u_int32_t inaddr, int start #ifndef HAVE_INET_ATON int inet_aton(const char *cp, struct in_addr *ia) { - return inet_pton(AF_INET, cp, &ia->s_addr); + return inet_pton(AF_INET, cp, (char*)&ia->s_addr); } #endif @@ -224,7 +224,7 @@ void remque(void *a) /* #endif */ -int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec, int addr, int port) +int add_exec(struct ex_list **ex_ptr, int do_pty, const char *exec, int addr, int port) { struct ex_list *tmp_ptr;