From a698a439beb8a06dace3b5558b921ba2549699a1 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 12 Sep 2007 08:38:22 +0000 Subject: gst/: Printf format fixes (#476128). Original commit message from CVS: Patch by: Peter Kjellerstedt * gst-libs/gst/app/gstappsink.c: * gst/flv/gstflvdemux.c: * gst/flv/gstflvparse.c: * gst/interleave/deinterleave.c: * gst/switch/gstswitch.c: Printf format fixes (#476128). --- ChangeLog | 11 +++++++++++ gst-libs/gst/app/gstappsink.c | 4 ++-- gst/flv/gstflvdemux.c | 6 ++++-- gst/flv/gstflvparse.c | 7 ++++--- gst/interleave/deinterleave.c | 2 +- gst/switch/gstswitch.c | 4 ++-- 6 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20e7af4f..007eecd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-09-12 Tim-Philipp Müller + + Patch by: Peter Kjellerstedt + + * gst-libs/gst/app/gstappsink.c: + * gst/flv/gstflvdemux.c: + * gst/flv/gstflvparse.c: + * gst/interleave/deinterleave.c: + * gst/switch/gstswitch.c: + Printf format fixes (#476128). + 2007-09-09 Tim-Philipp Müller Patch by: Thomas Green diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c index b4c65af8..eaf832fb 100644 --- a/gst-libs/gst/app/gstappsink.c +++ b/gst-libs/gst/app/gstappsink.c @@ -270,7 +270,7 @@ gst_app_sink_get_caps (GstBaseSink * psink) GST_OBJECT_LOCK (appsink); if ((caps = appsink->caps)) gst_caps_ref (caps); - GST_DEBUG_OBJECT (appsink, "got caps " GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (appsink, "got caps %" GST_PTR_FORMAT, caps); GST_OBJECT_UNLOCK (appsink); return caps; @@ -295,7 +295,7 @@ gst_app_sink_set_caps (GstAppSink * appsink, GstCaps * caps) g_return_if_fail (GST_IS_APP_SINK (appsink)); GST_OBJECT_LOCK (appsink); - GST_DEBUG_OBJECT (appsink, "setting caps to " GST_PTR_FORMAT, caps); + GST_DEBUG_OBJECT (appsink, "setting caps to %" GST_PTR_FORMAT, caps); gst_caps_replace (&appsink->caps, caps); GST_OBJECT_UNLOCK (appsink); } diff --git a/gst/flv/gstflvdemux.c b/gst/flv/gstflvdemux.c index 16250d1b..0d8d087c 100644 --- a/gst/flv/gstflvdemux.c +++ b/gst/flv/gstflvdemux.c @@ -321,12 +321,14 @@ gst_flv_demux_pull_tag (GstPad * pad, GstFLVDemux * demux) /* Pull the whole tag */ ret = gst_pad_pull_range (pad, demux->offset, demux->tag_size, &buffer); if (G_UNLIKELY (ret != GST_FLOW_OK)) { - GST_WARNING_OBJECT (demux, "failed when pulling %d bytes", demux->tag_size); + GST_WARNING_OBJECT (demux, + "failed when pulling %" G_GUINT64_FORMAT " bytes", demux->tag_size); goto beach; } if (G_UNLIKELY (buffer && GST_BUFFER_SIZE (buffer) != demux->tag_size)) { - GST_WARNING_OBJECT (demux, "partial pull got %d when expecting %d", + GST_WARNING_OBJECT (demux, + "partial pull got %d when expecting %" G_GUINT64_FORMAT, GST_BUFFER_SIZE (buffer), demux->tag_size); gst_buffer_unref (buffer); ret = GST_FLOW_UNEXPECTED; diff --git a/gst/flv/gstflvparse.c b/gst/flv/gstflvparse.c index eeb64546..6240e684 100644 --- a/gst/flv/gstflvparse.c +++ b/gst/flv/gstflvparse.c @@ -474,7 +474,7 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, const guint8 * data, caps = gst_caps_new_simple ("audio/x-raw-int", NULL); break; default: - GST_WARNING_OBJECT (demux, "unsupported audio codec tag", codec_tag); + GST_WARNING_OBJECT (demux, "unsupported audio codec tag %u", codec_tag); } if (G_UNLIKELY (!caps)) { @@ -541,7 +541,7 @@ gst_flv_parse_tag_audio (GstFLVDemux * demux, const guint8 * data, caps = gst_caps_new_simple ("audio/x-raw-int", NULL); break; default: - GST_WARNING_OBJECT (demux, "unsupported audio codec tag", codec_tag); + GST_WARNING_OBJECT (demux, "unsupported audio codec tag %u", codec_tag); } if (G_UNLIKELY (!caps)) { @@ -930,7 +930,8 @@ gst_flv_parse_tag_type (GstFLVDemux * demux, const guint8 * data, demux->tag_data_size = FLV_GET_BEUI24 (data + 1, data_size - 1); demux->tag_size = demux->tag_data_size + 11; - GST_LOG_OBJECT (demux, "tag data size is %d", demux->tag_data_size); + GST_LOG_OBJECT (demux, "tag data size is %" G_GUINT64_FORMAT, + demux->tag_data_size); return ret; } diff --git a/gst/interleave/deinterleave.c b/gst/interleave/deinterleave.c index 71c6a413..f2e79777 100644 --- a/gst/interleave/deinterleave.c +++ b/gst/interleave/deinterleave.c @@ -223,7 +223,7 @@ no_channels: static GstFlowReturn gst_deinterleave_process (GstDeinterleave * self, GstBuffer * buf) { - GstFlowReturn ret; + GstFlowReturn ret = GST_FLOW_OK; /* initialized to silence a warning */ GList *srcs; guint bufsize, i, j, channels, pads_pushed, nframes; GstBuffer **buffers_out; diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c index 52a8ec9d..4fce29e7 100644 --- a/gst/switch/gstswitch.c +++ b/gst/switch/gstswitch.c @@ -297,7 +297,7 @@ gst_switch_chain (GstPad * pad, GstBuffer * buf) "Sending new segment with start of %" G_GUINT64_FORMAT, start); } else { GST_WARNING_OBJECT (gstswitch, - "Couldn't find new segment for pad %s:%s in hashtable", + "Couldn't find new segment for pad %s in hashtable", GST_PAD_NAME (pad)); } /* reset stop and start value */ @@ -496,7 +496,7 @@ gst_switch_set_property (GObject * object, guint prop_id, "Sending new segment with start of %" G_GUINT64_FORMAT, start); } else { GST_WARNING_OBJECT (gstswitch, - "Couldn't find new segment for pad %s:%s in hashtable", + "Couldn't find new segment for pad %s in hashtable", GST_PAD_NAME (gstswitch->active_sinkpad)); } /* reset stop and start value */ -- cgit v1.2.1