slirp: Fix type casts and format strings in debug codev2.5.1.1v2.5.1v2.5.0-rc4v2.5.0-rc3v2.5.0-rc2v2.5.0-rc1v2.5.0-rc0v2.5.0

Casting pointers to long won't work on 64 bit Windows.
It is not needed with the right format strings.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Jason Wang <jasowang@redhat.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/socket.c b/socket.c
index 6643d67..d6fb453 100644
--- a/socket.c
+++ b/socket.c
@@ -85,7 +85,7 @@ size_t sopreprbuf(struct socket *so, struct iovec *iov, int *np)
     int mss = so->so_tcpcb->t_maxseg;
 
     DEBUG_CALL("sopreprbuf");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
 
     if (len <= 0)
         return 0;
@@ -149,7 +149,7 @@ int soread(struct socket *so)
     struct iovec iov[2];
 
     DEBUG_CALL("soread");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
 
     /*
      * No need to check if there's enough room to read.
@@ -211,7 +211,7 @@ int soreadbuf(struct socket *so, const char *buf, int size)
     struct iovec iov[2];
 
     DEBUG_CALL("soreadbuf");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
 
     /*
      * No need to check if there's enough room to read.
@@ -258,7 +258,7 @@ void sorecvoob(struct socket *so)
     struct tcpcb *tp = sototcpcb(so);
 
     DEBUG_CALL("sorecvoob");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
 
     /*
      * We take a guess at how much urgent data has arrived.
@@ -287,7 +287,7 @@ int sosendoob(struct socket *so)
     int n, len;
 
     DEBUG_CALL("sosendoob");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
     DEBUG_ARG("sb->sb_cc = %d", sb->sb_cc);
 
     if (so->so_urgc > 2048)
@@ -351,7 +351,7 @@ int sowrite(struct socket *so)
     struct iovec iov[2];
 
     DEBUG_CALL("sowrite");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
 
     if (so->so_urgc) {
         sosendoob(so);
@@ -444,7 +444,7 @@ void sorecvfrom(struct socket *so)
     socklen_t addrlen = sizeof(struct sockaddr_in);
 
     DEBUG_CALL("sorecvfrom");
-    DEBUG_ARG("so = %lx", (long)so);
+    DEBUG_ARG("so = %p", so);
 
     if (so->so_type == IPPROTO_ICMP) { /* This is a "ping" reply */
         char buff[256];
@@ -548,8 +548,8 @@ int sosendto(struct socket *so, struct mbuf *m)
     struct sockaddr_in addr;
 
     DEBUG_CALL("sosendto");
-    DEBUG_ARG("so = %lx", (long)so);
-    DEBUG_ARG("m = %lx", (long)m);
+    DEBUG_ARG("so = %p", so);
+    DEBUG_ARG("m = %p", m);
 
     addr.sin_family = AF_INET;
     if ((so->so_faddr.s_addr & slirp->vnetwork_mask.s_addr) ==