From 71abd2896c648f97d29e3af8a287e7732324b5fc Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Thu, 11 Apr 2019 21:37:59 -0700
Subject: [PATCH] SLIRP: Fix Coverity complaints

---
 slirp/misc.c     |  2 +-
 slirp/sbuf.c     |  2 +-
 slirp/slirp.c    |  2 +-
 slirp/socket.c   | 14 +++++++-------
 slirp/tcp_subr.c | 10 +++++-----
 slirp/tftp.c     |  2 +-
 slirp/udp.c      |  6 +++---
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/slirp/misc.c b/slirp/misc.c
index e07c178c..088918f6 100644
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -297,7 +297,7 @@ void slirp_connection_info(Slirp *slirp, Monitor *mon)
         if (so->so_state & SS_HOSTFWD) {
             snprintf(buf, sizeof(buf), "  UDP[HOST_FORWARD]");
             src_len = sizeof(src);
-            getsockname(so->s, (struct sockaddr *)&src, &src_len);
+            (void)getsockname(so->s, (struct sockaddr *)&src, &src_len);
             dst_addr = so->so_laddr;
             dst_port = so->so_lport;
         } else {
diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index 5428927a..d0888d5c 100644
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -90,7 +90,7 @@ sbappend(struct socket *so, struct mbuf *m)
         if (so->so_urgc) {
                 sbappendsb(&so->so_rcv, m);
                 m_free(m);
-                sosendoob(so);
+                (void)sosendoob(so);
                 return;
         }
 
diff --git a/slirp/slirp.c b/slirp/slirp.c
index e764375b..1fa8654e 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -545,7 +545,7 @@ void slirp_pollfds_poll(GArray *pollfds, int select_error)
                         so->so_state &= ~SS_ISFCONNECTING;
 
                         ret = send(so->s, (const char *) &ret, 0, 0);
-                        if (ret < 0) {
+                        if (ret == SOCKET_ERROR) {
                             /* XXXXX Must fix, zero bytes is a NOP */
                             if (errno == EAGAIN || errno == EWOULDBLOCK ||
                                 errno == EINPROGRESS || errno == ENOTCONN) {
diff --git a/slirp/socket.c b/slirp/socket.c
index 27cc9dd7..ac6b9549 100644
--- a/slirp/socket.c
+++ b/slirp/socket.c
@@ -354,7 +354,7 @@ sowrite(struct socket *so)
         DEBUG_ARG("so = %lx", (long)so);
 
         if (so->so_urgc) {
-                sosendoob(so);
+                (void)sosendoob(so);
                 if (sb->sb_cc == 0)
                         return 0;
         }
@@ -626,10 +626,10 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
         addr.sin_addr.s_addr = haddr;
         addr.sin_port = hport;
 
-        if (((s = qemu_socket(AF_INET,SOCK_STREAM,0)) < 0) ||
-            (socket_set_fast_reuse(s) < 0) ||
-            (bind(s,(struct sockaddr *)&addr, sizeof(addr)) < 0) ||
-            (listen(s,1) < 0)) {
+        if (((s = qemu_socket(AF_INET,SOCK_STREAM,0)) == SOCKET_ERROR) ||
+            (socket_set_fast_reuse(s) == SOCKET_ERROR) ||
+            (bind(s,(struct sockaddr *)&addr, sizeof(addr)) == SOCKET_ERROR) ||
+            (listen(s,1) == SOCKET_ERROR)) {
                 int tmperrno = errno; /* Don't clobber the real reason we failed */
 
                 closesocket(s);
@@ -643,9 +643,9 @@ tcp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
 #endif
                 return NULL;
         }
-        qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
+        (void)qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
 
-        getsockname(s,(struct sockaddr *)&addr,&addrlen);
+        (void)getsockname(s,(struct sockaddr *)&addr,&addrlen);
         so->so_fport = addr.sin_port;
         if (addr.sin_addr.s_addr == 0 || addr.sin_addr.s_addr == loopback_addr.s_addr)
            so->so_faddr = slirp->vhost_addr;
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
index 067e74a1..8d25af8f 100644
--- a/slirp/tcp_subr.c
+++ b/slirp/tcp_subr.c
@@ -336,10 +336,10 @@ int tcp_fconnect(struct socket *so)
     int opt, s=so->s;
     struct sockaddr_in addr;
 
-    qemu_set_nonblock(s);
+    (void)qemu_set_nonblock(s);
     socket_set_fast_reuse(s);
     opt = 1;
-    qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
+    (void)qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(opt));
 
     addr.sin_family = AF_INET;
     if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==
@@ -425,10 +425,10 @@ void tcp_connect(struct socket *inso)
         return;
     }
     qemu_set_nonblock(s);
-    socket_set_fast_reuse(s);
+    (void)socket_set_fast_reuse(s);
     opt = 1;
-    qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
-    socket_set_nodelay(s);
+    (void)qemu_setsockopt(s, SOL_SOCKET, SO_OOBINLINE, &opt, sizeof(int));
+    (void)socket_set_nodelay(s);
 
     so->so_fport = addr.sin_port;
     so->so_faddr = addr.sin_addr;
diff --git a/slirp/tftp.c b/slirp/tftp.c
index 4df5ffa0..2d7d5a3d 100644
--- a/slirp/tftp.c
+++ b/slirp/tftp.c
@@ -111,7 +111,7 @@ static int tftp_read_data(struct tftp_session *spt, uint32_t block_nr,
     }
 
     if (len) {
-        fseek(spt->f, block_nr * 512, SEEK_SET);
+        (void)fseek(spt->f, block_nr * 512, SEEK_SET);
 
         bytes_read = fread(buf, 1, len, spt->f);
     }
diff --git a/slirp/udp.c b/slirp/udp.c
index 605f2177..72580b4c 100644
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -368,13 +368,13 @@ udp_listen(Slirp *slirp, uint32_t haddr, u_int hport, uint32_t laddr,
         addr.sin_addr.s_addr = haddr;
         addr.sin_port = hport;
 
-        if (bind(so->s,(struct sockaddr *)&addr, addrlen) < 0) {
+        if (bind(so->s,(struct sockaddr *)&addr, addrlen) == SOCKET_ERROR) {
                 udp_detach(so);
                 return NULL;
         }
-        socket_set_fast_reuse(so->s);
+        (void)socket_set_fast_reuse(so->s);
 
-        getsockname(so->s,(struct sockaddr *)&addr,&addrlen);
+        (void)getsockname(so->s,(struct sockaddr *)&addr,&addrlen);
         so->so_fport = addr.sin_port;
         if (addr.sin_addr.s_addr == 0 ||
             addr.sin_addr.s_addr == loopback_addr.s_addr) {