From 64160a1392b5fa9e47b424ae45441b376ca5a410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 28 Jun 2014 23:26:23 +0200 Subject: [PATCH] kate: Use G_GSIZE_FORMAT instead of unportable %zu --- ext/kate/gstkateenc.c | 6 ++++-- ext/kate/gstkateparse.c | 2 +- ext/kate/gstkatespu.c | 6 +++--- ext/kate/gstkateutil.c | 12 +++++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c index 89f5f85025..595868f3eb 100644 --- a/ext/kate/gstkateenc.c +++ b/ext/kate/gstkateenc.c @@ -848,7 +848,8 @@ gst_kate_enc_chain_spu (GstKateEnc * ke, GstBuffer * buf) } } #endif - GST_DEBUG_OBJECT (ke, "Encoding %zux%zu SPU: (%zu bytes) from %f to %f", + GST_DEBUG_OBJECT (ke, "Encoding %" G_GSIZE_FORMAT "x%" G_GSIZE_FORMAT + " SPU: (%" G_GSIZE_FORMAT " bytes) from %f to %f", kbitmap->width, kbitmap->height, gst_buffer_get_size (buf), t0, t1); ret = kate_encode_set_region (&ke->k, kregion); @@ -977,7 +978,8 @@ gst_kate_enc_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) GstKateEnc *ke = GST_KATE_ENC (parent); GstFlowReturn rflow; - GST_DEBUG_OBJECT (ke, "got packet, %zu bytes", gst_buffer_get_size (buf)); + GST_DEBUG_OBJECT (ke, "got packet, %" G_GSIZE_FORMAT " bytes", + gst_buffer_get_size (buf)); /* first push headers if we haven't done that yet */ rflow = gst_kate_enc_flush_headers (ke); diff --git a/ext/kate/gstkateparse.c b/ext/kate/gstkateparse.c index cbbd912e0c..86657b87ef 100644 --- a/ext/kate/gstkateparse.c +++ b/ext/kate/gstkateparse.c @@ -362,7 +362,7 @@ gst_kate_parse_parse_packet (GstKateParse * parse, GstBuffer * buf) size = gst_buffer_extract (buf, 0, header, 1); - GST_LOG_OBJECT (parse, "Got packet %02x, %zu bytes", + GST_LOG_OBJECT (parse, "Got packet %02x, %" G_GSIZE_FORMAT " bytes", size ? header[0] : -1, gst_buffer_get_size (buf)); if (size > 0 && header[0] & 0x80) { diff --git a/ext/kate/gstkatespu.c b/ext/kate/gstkatespu.c index 1b7dbc79bf..bdf0dd8298 100644 --- a/ext/kate/gstkatespu.c +++ b/ext/kate/gstkatespu.c @@ -386,7 +386,7 @@ out_of_range: { gst_buffer_unmap (buf, &info); GST_ELEMENT_ERROR (ke, STREAM, DECODE, (NULL), - ("Command sequence offset %u is out of range %zu", + ("Command sequence offset %u is out of range %" G_GSIZE_FORMAT, command_sequence_offset, info.size)); return GST_FLOW_ERROR; } @@ -505,8 +505,8 @@ gst_kate_spu_decode_spu (GstKateEnc * ke, GstBuffer * buf, kate_region * kr, CHECK (2); packet_size = GST_KATE_UINT16_BE (ptr); ADVANCE (2); - GST_DEBUG_OBJECT (ke, "packet size %d (GstBuffer size %zu)", packet_size, - info.size); + GST_DEBUG_OBJECT (ke, "packet size %d (GstBuffer size %" G_GSIZE_FORMAT ")", + packet_size, info.size); CHECK (2); next_command_sequence = GST_KATE_UINT16_BE (ptr); diff --git a/ext/kate/gstkateutil.c b/ext/kate/gstkateutil.c index bd0a3e5f8a..e5b519b244 100644 --- a/ext/kate/gstkateutil.c +++ b/ext/kate/gstkateutil.c @@ -289,7 +289,8 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder, header_size = gst_buffer_extract (buf, 0, header, 1); - GST_DEBUG_OBJECT (element, "got kate packet, %zu bytes, type %02x", + GST_DEBUG_OBJECT (element, + "got kate packet, %" G_GSIZE_FORMAT " bytes, type %02x", gst_buffer_get_size (buf), header_size == 0 ? -1 : header[0]); is_header = header_size > 0 && (header[0] & 0x80); @@ -429,15 +430,16 @@ gst_kate_util_decoder_base_chain_kate_packet (GstKateDecoderBase * decoder, } else { if (gst_kate_util_is_utf8_string (value, len)) { gchar *compound = g_strdup_printf ("%s=%s", tag, value); - GST_DEBUG_OBJECT (decoder, "Metadata %d: %s=%s (%zu bytes)", idx, - tag, value, len); + GST_DEBUG_OBJECT (decoder, + "Metadata %d: %s=%s (%" G_GSIZE_FORMAT " bytes)", idx, tag, + value, len); gst_tag_list_add (evtags, GST_TAG_MERGE_APPEND, GST_TAG_EXTENDED_COMMENT, compound, NULL); g_free (compound); } else { GST_INFO_OBJECT (decoder, - "Metadata %d, (%s, %zu bytes) is binary, ignored", idx, tag, - len); + "Metadata %d, (%s, %" G_GSIZE_FORMAT + " bytes) is binary, ignored", idx, tag, len); } } }