|
 |
5544c1 |
From 3196332dd2ca39a9b06562856b80b825217e3c96 Mon Sep 17 00:00:00 2001
|
|
|
5544c1 |
From: Stefan Weil <sw@weilnetz.de>
|
|
|
5544c1 |
Date: Tue, 4 Sep 2012 23:20:35 +0200
|
|
|
5544c1 |
Subject: [PATCH] slirp: Remove wrong type casts ins debug statements
|
|
|
5544c1 |
|
|
|
5544c1 |
The type casts of pointers to long are not allowed
|
|
|
5544c1 |
when sizeof(pointer) != sizeof(long).
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Stefan Weil <sw@weilnetz.de>
|
|
|
5544c1 |
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
|
|
|
5544c1 |
(cherry picked from commit c4d12a743c73a5b88a8705ca68ff620ce0f8bba7)
|
|
|
5544c1 |
|
|
|
5544c1 |
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
|
|
|
5544c1 |
---
|
|
|
5544c1 |
slirp/tcp_subr.c | 6 +++---
|
|
|
5544c1 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
5544c1 |
|
|
|
5544c1 |
diff --git a/slirp/tcp_subr.c b/slirp/tcp_subr.c
|
|
|
5544c1 |
index 025b374..5890d7a 100644
|
|
|
5544c1 |
--- a/slirp/tcp_subr.c
|
|
|
5544c1 |
+++ b/slirp/tcp_subr.c
|
|
|
5544c1 |
@@ -114,9 +114,9 @@ tcp_respond(struct tcpcb *tp, struct tcpiphdr *ti, struct mbuf *m,
|
|
|
5544c1 |
int win = 0;
|
|
|
5544c1 |
|
|
|
5544c1 |
DEBUG_CALL("tcp_respond");
|
|
|
5544c1 |
- DEBUG_ARG("tp = %lx", (long)tp);
|
|
|
5544c1 |
- DEBUG_ARG("ti = %lx", (long)ti);
|
|
|
5544c1 |
- DEBUG_ARG("m = %lx", (long)m);
|
|
|
5544c1 |
+ DEBUG_ARG("tp = %p", tp);
|
|
|
5544c1 |
+ DEBUG_ARG("ti = %p", ti);
|
|
|
5544c1 |
+ DEBUG_ARG("m = %p", m);
|
|
|
5544c1 |
DEBUG_ARG("ack = %u", ack);
|
|
|
5544c1 |
DEBUG_ARG("seq = %u", seq);
|
|
|
5544c1 |
DEBUG_ARG("flags = %x", flags);
|
|
|
5544c1 |
--
|
|
|
5544c1 |
1.7.12.1
|
|
|
5544c1 |
|