Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/gg/lib/tvbuff.c	Sun Mar 02 10:34:51 2014 +0100
+++ b/libpurple/protocols/gg/lib/tvbuff.c	Fri Mar 07 23:17:08 2014 +0100
@@ -140,7 +140,8 @@
 		return 1;
 
 	gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_have_remaining() failed "
-		"(%d < %d)\n", gg_tvbuff_get_remaining(tvb), length);
+		"(%" GG_SIZE_FMT " < %" GG_SIZE_FMT ")\n",
+		gg_tvbuff_get_remaining(tvb), length);
 	tvb->valid = 0;
 	return 0;
 }
@@ -227,7 +228,7 @@
 
 	if (!gg_tvbuff_have_remaining(tvb, 1)) {
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_uint8() "
-			"failed at %d\n", tvb->offset);
+			"failed at %" GG_SIZE_FMT "\n", tvb->offset);
 		return 0;
 	}
 
@@ -250,7 +251,7 @@
 
 	if (!gg_tvbuff_have_remaining(tvb, 4)) {
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_uint32() "
-			"failed at %d\n", tvb->offset);
+			"failed at %" GG_SIZE_FMT "\n", tvb->offset);
 		return 0;
 	}
 
@@ -276,7 +277,7 @@
 
 	if (!gg_tvbuff_have_remaining(tvb, 8)) {
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_uint64() "
-			"failed at %d\n", tvb->offset);
+			"failed at %" GG_SIZE_FMT "\n", tvb->offset);
 		return 0;
 	}
 
@@ -364,7 +365,8 @@
 
 	if (!gg_tvbuff_have_remaining(tvb, length)) {
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_get_buff() "
-			"failed at %d:%d\n", tvb->offset, length);
+			"failed at %" GG_SIZE_FMT ":%" GG_SIZE_FMT "\n",
+			tvb->offset, length);
 		return NULL;
 	}
 
@@ -387,7 +389,8 @@
 
 	if (!gg_tvbuff_have_remaining(tvb, length)) {
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_buff() "
-			"failed at %d:%d\n", tvb->offset, length);
+			"failed at %" GG_SIZE_FMT ":%" GG_SIZE_FMT "\n",
+			tvb->offset, length);
 		return;
 	}
 
@@ -424,9 +427,10 @@
 	offset = tvb->offset;
 	str_len = gg_tvbuff_read_packed_uint(tvb);
 	if (!gg_tvbuff_is_valid(tvb) ||
-		!gg_tvbuff_have_remaining(tvb, str_len)) {
+		!gg_tvbuff_have_remaining(tvb, str_len))
+	{
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_str() failed at "
-			"%d:%d\n", offset, str_len);
+			"%" GG_SIZE_FMT ":%d\n", offset, str_len);
 		return NULL;
 	}
 
@@ -466,9 +470,10 @@
 	offset = tvb->offset;
 	str_len = gg_tvbuff_read_packed_uint(tvb);
 	if (!gg_tvbuff_is_valid(tvb) ||
-		!gg_tvbuff_have_remaining(tvb, str_len)) {
+		!gg_tvbuff_have_remaining(tvb, str_len))
+	{
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_str_dup() failed "
-			"at %d:%d\n", offset, str_len);
+			"at %" GG_SIZE_FMT ":%d\n", offset, str_len);
 		return;
 	}
 
@@ -517,7 +522,8 @@
 
 	if (full_len != uin_len + 2 ||
 		uin_type != 0 ||
-		uin_len > 10) {
+		uin_len > 10)
+	{
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_read_uin() failed (1)\n");
 		tvb->valid = 0;
 		return 0;
@@ -555,7 +561,7 @@
 
 	if (got != value)
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_expected_uint8() "
-			"expected %#02x, but %#02x found at %d\n",
+			"expected %#02x, but %#02x found at %" GG_SIZE_FMT "\n",
 			value, got, offset);
 }
 
@@ -578,7 +584,7 @@
 
 	if (got != value)
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_expected_uint32() "
-			"expected %#08x, but %#08x found at %d\n",
+			"expected %#08x, but %#08x found at %" GG_SIZE_FMT "\n",
 			value, got, offset);
 }
 
@@ -595,7 +601,7 @@
 
 	if (gg_tvbuff_get_remaining(tvb) != 0)
 		gg_debug(GG_DEBUG_WARNING, "// gg_tvbuff_expected_eob() "
-			"unexpected %d bytes, first=%#02x\n",
+			"unexpected %" GG_SIZE_FMT " bytes, first=%#02x\n",
 			gg_tvbuff_get_remaining(tvb),
 			tvb->buffer[tvb->offset]);
 }