From c403790b6cb1c9af19a71064f71bf43ae12e77d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 5 Oct 2006 18:14:46 +0000 Subject: [PATCH] Another batch of printf format fixes. Original commit message from CVS: * ext/dts/gstdtsdec.c: (gst_dtsdec_chain): * ext/musicbrainz/gsttrm.c: (gst_trm_setcaps): * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_sink_set_caps): * gst/qtdemux/qtdemux.c: (gst_qtdemux_chain), (qtdemux_parse), (qtdemux_parse_trak): * gst/spectrum/gstspectrum.c: (gst_spectrum_transform_ip): Another batch of printf format fixes. --- ChangeLog | 10 ++++++++++ ext/dts/gstdtsdec.c | 2 +- ext/musicbrainz/gsttrm.c | 2 +- ext/wavpack/gstwavpackenc.c | 4 ++-- gst/qtdemux/qtdemux.c | 19 ++++++++++--------- gst/spectrum/gstspectrum.c | 2 +- 6 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d11ab9c1a..7f279df61c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-10-05 Tim-Philipp Müller + + * ext/dts/gstdtsdec.c: (gst_dtsdec_chain): + * ext/musicbrainz/gsttrm.c: (gst_trm_setcaps): + * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_sink_set_caps): + * gst/qtdemux/qtdemux.c: (gst_qtdemux_chain), (qtdemux_parse), + (qtdemux_parse_trak): + * gst/spectrum/gstspectrum.c: (gst_spectrum_transform_ip): + Another batch of printf format fixes. + 2006-10-04 Tim-Philipp Müller * gst/videocrop/gstvideocrop.c: (gst_video_crop_class_init), diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c index 3bfd2dc315..6b913dc6d0 100644 --- a/ext/dts/gstdtsdec.c +++ b/ext/dts/gstdtsdec.c @@ -475,7 +475,7 @@ gst_dtsdec_chain (GstPad * pad, GstBuffer * buf) { GstDtsDec *dts; guint8 *data; - gint64 size; + gint size; gint length, flags, sample_rate, bit_rate, frame_length; GstFlowReturn result = GST_FLOW_OK; diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c index 4732d73f2c..5f092b72ae 100644 --- a/ext/musicbrainz/gsttrm.c +++ b/ext/musicbrainz/gsttrm.c @@ -201,7 +201,7 @@ gst_trm_setcaps (GstPad * pad, GstCaps * caps) } if (trm->depth != width) { - GST_DEBUG_OBJECT (trm, "depth != width (%d != %d)", trm->depth != width); + GST_DEBUG_OBJECT (trm, "depth != width (%d != %d)", trm->depth, width); goto failure; } diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index 22d8f9765d..dbc3a31ccf 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -354,7 +354,7 @@ gst_wavpack_enc_sink_set_caps (GstPad * pad, GstCaps * caps) !(gst_structure_get_int (structure, "depth", &depth) || depth != enc->width)) { GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL), - ("got invalid caps: %", GST_PTR_FORMAT, caps)); + ("got invalid caps: %" GST_PTR_FORMAT, caps)); gst_object_unref (enc); return FALSE; } @@ -367,7 +367,7 @@ gst_wavpack_enc_sink_set_caps (GstPad * pad, GstCaps * caps) if (!gst_pad_set_caps (enc->srcpad, caps)) { GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL), - ("setting caps failed: %", GST_PTR_FORMAT, caps)); + ("setting caps failed: %" GST_PTR_FORMAT, caps)); gst_caps_unref (caps); gst_object_unref (enc); return FALSE; diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index cc60e4b0c4..6ec89eb0a6 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -1567,8 +1567,8 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf) /* get fourcc/length, set neededbytes */ extract_initial_length_and_fourcc ((guint8 *) data, &size, &fourcc); GST_DEBUG_OBJECT (demux, - "Peeking found [%" GST_FOURCC_FORMAT "] size:%ld", - GST_FOURCC_ARGS (fourcc), size); + "Peeking found [%" GST_FOURCC_FORMAT "] size: %u", + GST_FOURCC_ARGS (fourcc), (guint) size); if ((fourcc == GST_MAKE_FOURCC ('m', 'd', 'a', 't'))) { if (demux->n_streams > 0) { demux->state = QTDEMUX_STATE_MOVIE; @@ -1719,7 +1719,7 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf) stream->sample_index++; /* update current offset and figure out size of next buffer */ - GST_LOG_OBJECT (demux, "bumping offset:%lld up by %lld", + GST_LOG_OBJECT (demux, "increasing offset %" G_GUINT64_FORMAT " by %u", demux->offset, demux->neededbytes); demux->offset += demux->neededbytes; GST_LOG_OBJECT (demux, "offset is now %lld", demux->offset); @@ -2257,7 +2257,7 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length) } len = QTDEMUX_GUINT32_GET (buf); if (len < 8) { - GST_WARNING ("length too short (%d < 8)"); + GST_WARNING ("length too short (%d < 8)", len); break; } if (len > (end - buf)) { @@ -2290,7 +2290,7 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length) } len = QTDEMUX_GUINT32_GET (buf); if (len < 8) { - GST_WARNING ("length too short (%d < 8)"); + GST_WARNING ("length too short (%d < 8)", len); break; } if (len > (end - buf)) { @@ -2345,7 +2345,7 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length) if (len == 0) break; if (len < 8) { - GST_WARNING ("length too short (%d < 8)"); + GST_WARNING ("length too short (%d < 8)", len); break; } if (len > (end - buf)) { @@ -2375,7 +2375,7 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length) } len = QTDEMUX_GUINT32_GET (buf); if (len < 8) { - GST_WARNING ("length too short (%d < 8)"); + GST_WARNING ("length too short (%d < 8)", len); break; } if (len > (end - buf)) { @@ -2424,7 +2424,7 @@ qtdemux_parse (GstQTDemux * qtdemux, GNode * node, void *buffer, int length) if (len == 0) break; if (len < 8) { - GST_WARNING ("length too short (%d < 8)"); + GST_WARNING ("length too short (%d < 8)", len); break; } if (len > (end - buf)) { @@ -3335,7 +3335,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) GST_LOG ("stsd len: %d", len); stream->fourcc = fourcc = QTDEMUX_FOURCC_GET (stsd->data + 16 + 4); - GST_LOG ("stsd type: %" GST_FOURCC_FORMAT, stream->fourcc); + GST_LOG ("stsd type: %" GST_FOURCC_FORMAT, + GST_FOURCC_ARGS (stream->fourcc)); offset = 32; diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index cfb31e5ec9..7c1dacdefe 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -429,7 +429,7 @@ gst_spectrum_transform_ip (GstBaseTransform * trans, GstBuffer * in) GstClockTime blktime = GST_FRAMES_TO_CLOCK_TIME (spectrum->len, spectrum->rate); - GST_LOG ("transform : %ld bytes", GST_BUFFER_SIZE (in)); + GST_LOG ("input size: %d bytes", GST_BUFFER_SIZE (in)); gst_adapter_push (spectrum->adapter, gst_buffer_ref (in)); /* required number of bytes */