Cast pointer arguments of get/setsockopt, send to void * to keep GCC

from producing a warning about pointer type mismatches with Winsock

Signed-off-by: malc <av1474@comtv.ru>

diff --git a/migration-tcp.c b/migration-tcp.c
index d9c4c986db1d5d154e3cc0fe59dc5448c6877e9f..1f4358ee5ff0cff62486151991613d7998577c97 100644 (file)
--- a/migration-tcp.c
+++ b/migration-tcp.c
@@ -58,7 +58,7 @@ static void tcp_wait_for_connect(void *opaque)
 
     dprintf("connect completed\n");
     do {
-        ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, &val, &valsize);
+        ret = getsockopt(s->fd, SOL_SOCKET, SO_ERROR, (void *) &val, &valsize);
     } while (ret == -1 && (s->get_error(s)) == EINTR);
 
     if (ret < 0) {

diff --git a/nbd.c b/nbd.c
index 1586ea7553dcf7262afe9287870e3d5e9dbf6210..b397a5f48755e771ef9daf9c6f338c5a5fc00038 100644 (file)
--- a/nbd.c
+++ b/nbd.c
@@ -169,7 +169,8 @@ int tcp_socket_incoming(const char *address, uint16_t port)
     memcpy(&addr.sin_addr.s_addr, &in, sizeof(in));
 
     opt = 1;
-    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) == -1) {
+    if (setsockopt(s, SOL_SOCKET, SO_REUSEADDR,
+                   (const void *) &opt, sizeof(opt)) == -1) {
         goto error;
     }
 

diff --git a/slirp/slirp.c b/slirp/slirp.c
index 4ca35b28f64c14d84cb364c6dd973e6d26a1ce8f..04d3dede23ddafb34e2a1759767241eb5ec90d67 100644 (file)
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -468,7 +468,7 @@ void slirp_select_poll(fd_set *readfds, fd_set *writefds, fd_set *xfds)
                            /* Connected */
                            so->so_state &= ~SS_ISFCONNECTING;
 
-                           ret = send(so->s, &ret, 0, 0);
+                           ret = send(so->s, (const void *) &ret, 0, 0);
                            if (ret < 0) {
                              /* XXXXX Must fix, zero bytes is a NOP */
                              if (errno == EAGAIN || errno == EWOULDBLOCK ||