Merge remote-tracking branch 'remotes/kraxel/tags/ipxe-pull-request' into staging

[mirror_qemu.git] / slirp / sbuf.c

diff --git a/slirp/sbuf.c b/slirp/sbuf.c
index 08ec2b4f44d0db2d0894cc6176a0923b5424a8ad..912f235f6524bf116e4ce687be5d1080d6f56710 100644 (file)
--- a/slirp/sbuf.c
+++ b/slirp/sbuf.c
@@ -5,8 +5,9 @@
  * terms and conditions of the copyright.
  */
 
-#include <slirp.h>
-#include <qemu/main-loop.h>
+#include "qemu/osdep.h"
+#include "slirp.h"
+#include "qemu/main-loop.h"
 
 static void sbappendsb(struct sbuf *sb, struct mbuf *m);
 
@@ -72,8 +73,8 @@ sbappend(struct socket *so, struct mbuf *m)
        int ret = 0;
 
        DEBUG_CALL("sbappend");
-       DEBUG_ARG("so = %lx", (long)so);
-       DEBUG_ARG("m = %lx", (long)m);
+       DEBUG_ARG("so = %p", so);
+       DEBUG_ARG("m = %p", m);
        DEBUG_ARG("m->m_len = %d", m->m_len);
 
        /* Shouldn't happen, but...  e.g. foreign host closes connection */
@@ -90,7 +91,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;
        }