summaryrefslogtreecommitdiff
path: root/libpurple/protocols/oscar/peer_proxy.c
diff options
context:
space:
mode:
Diffstat (limited to 'libpurple/protocols/oscar/peer_proxy.c')
-rw-r--r--libpurple/protocols/oscar/peer_proxy.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpurple/protocols/oscar/peer_proxy.c b/libpurple/protocols/oscar/peer_proxy.c
index 1ef991b704..6bf5c07c80 100644
--- a/libpurple/protocols/oscar/peer_proxy.c
+++ b/libpurple/protocols/oscar/peer_proxy.c
@@ -32,8 +32,8 @@ peer_proxy_send(PeerConnection *conn, ProxyFrame *frame)
ByteStream bs;
purple_debug_info("oscar", "Outgoing peer proxy frame with "
- "type=0x%04hx, unknown=0x%08x, "
- "flags=0x%04hx, and payload length=%hd\n",
+ "type=0x%04hx, unknown=0x%08x, flags=0x%04hx, and "
+ "payload length=%" G_GSIZE_FORMAT "\n",
frame->type, frame->unknown,
frame->flags, frame->payload.len);
@@ -129,8 +129,8 @@ static void
peer_proxy_recv_frame(PeerConnection *conn, ProxyFrame *frame)
{
purple_debug_info("oscar", "Incoming peer proxy frame with "
- "type=0x%04hx, unknown=0x%08x, "
- "flags=0x%04hx, and payload length=%hd\n", frame->type,
+ "type=0x%04hx, unknown=0x%08x, flags=0x%04hx, and "
+ "payload length=%" G_GSIZE_FORMAT "\n", frame->type,
frame->unknown, frame->flags, frame->payload.len);
if (frame->type == PEER_PROXY_TYPE_CREATED)
@@ -168,7 +168,7 @@ peer_proxy_recv_frame(PeerConnection *conn, ProxyFrame *frame)
}
else if (frame->type == PEER_PROXY_TYPE_ERROR)
{
- if (byte_stream_empty(&frame->payload) >= 2)
+ if (byte_stream_bytes_left(&frame->payload) >= 2)
{
guint16 error;
const char *msg;