slirp: Fix spurious error report when sending directly

Move check to where it actually is useful, and reduce scope of 'len'
variable along the way.

Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

1 files changed, 7 insertions, 7 deletions

diff --git a/socket.c b/socket.c
index 160b460..855acc2 100644
--- a/socket.c
+++ b/socket.c
@@ -336,7 +336,7 @@ int sosendoob(struct socket *so)
     struct sbuf *sb = &so->so_rcv;
     char buff[2048]; /* XXX Shouldn't be sending more oob data than this */
 
-    int n, len;
+    int n;
 
     DEBUG_CALL("sosendoob");
     DEBUG_ARG("so = %p", so);
@@ -356,7 +356,7 @@ int sosendoob(struct socket *so)
          * send it all
          */
         uint32_t urgc = so->so_urgc;
-        len = (sb->sb_data + sb->sb_datalen) - sb->sb_rptr;
+        int len = (sb->sb_data + sb->sb_datalen) - sb->sb_rptr;
         if (len > urgc) {
             len = urgc;
         }
@@ -371,13 +371,13 @@ int sosendoob(struct socket *so)
             len += n;
         }
         n = slirp_send(so, buff, len, (MSG_OOB)); /* |MSG_DONTWAIT)); */
-    }
-
 #ifdef DEBUG
-    if (n != len) {
-        DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));
-    }
+        if (n != len) {
+            DEBUG_ERROR((dfd, "Didn't send all data urgently XXXXX\n"));
+        }
 #endif
+    }
+
     if (n < 0) {
         return n;
     }