From 03f40e53fdebc228e1e0acd852fb0881f88236cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 5 Oct 2006 17:07:52 +0000 Subject: [PATCH] Printf format fixes. Original commit message from CVS: * ext/dvdread/dvdreadsrc.c: (gst_dvd_read_src_goto_title), (gst_dvd_read_src_handle_seek_event): * ext/mad/gstid3tag.c: (gst_id3_tag_chain): * ext/mad/gstmad.c: (gst_mad_src_query), (gst_mad_chain): * ext/sidplay/gstsiddec.cc: * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_parse_data): * gst/realmedia/rmdemux.c: (gst_rmdemux_loop), (gst_rmdemux_parse_packet): Printf format fixes. --- ChangeLog | 12 ++++++++++++ common | 2 +- ext/dvdread/dvdreadsrc.c | 6 +++--- ext/mad/gstid3tag.c | 4 ++-- ext/mad/gstmad.c | 9 +++++---- ext/sidplay/gstsiddec.cc | 2 +- gst/asfdemux/gstasfdemux.c | 2 +- gst/realmedia/rmdemux.c | 8 ++++---- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26ba6b5960..2d1084b6aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-10-05 Tim-Philipp Müller + + * ext/dvdread/dvdreadsrc.c: (gst_dvd_read_src_goto_title), + (gst_dvd_read_src_handle_seek_event): + * ext/mad/gstid3tag.c: (gst_id3_tag_chain): + * ext/mad/gstmad.c: (gst_mad_src_query), (gst_mad_chain): + * ext/sidplay/gstsiddec.cc: + * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_parse_data): + * gst/realmedia/rmdemux.c: (gst_rmdemux_loop), + (gst_rmdemux_parse_packet): + Printf format fixes. + 2006-10-03 Wim Taymans * gst/realmedia/Makefile.am: diff --git a/common b/common index 9991f6fa61..a4af1b8542 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 9991f6fa61ee11475c390dd6675ef7952f079e43 +Subproject commit a4af1b8542911352e29d53fba47e2c3d7231ebdb diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c index 28cce14126..48a539dc2d 100644 --- a/ext/dvdread/dvdreadsrc.c +++ b/ext/dvdread/dvdreadsrc.c @@ -525,8 +525,8 @@ gst_dvd_read_src_goto_title (GstDvdReadSrc * src, gint title, gint angle) lang_code[0] = '\0'; } - GST_INFO_OBJECT (src, "[%02d] Subtitle %02d: lang='%s', format=%d", - src->title + 1, i, lang_code); + GST_INFO_OBJECT (src, "[%02d] Subtitle %02d: lang='%s', type=%d", + src->title + 1, i, lang_code, u->type); } src->title_lang_event_pending = @@ -1051,7 +1051,7 @@ gst_dvd_read_src_handle_seek_event (GstDvdReadSrc * src, GstEvent * event) if (new_off < 0 || new_off >= src->num_angles) { GST_OBJECT_UNLOCK (src); GST_DEBUG_OBJECT (src, "invalid angle %d, only %d available", - src->num_angles); + src->num_angles, src->num_angles); return FALSE; } src->angle = (gint) new_off; diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c index 4a74fc92d3..5c4c62f9f6 100644 --- a/ext/mad/gstid3tag.c +++ b/ext/mad/gstid3tag.c @@ -1243,7 +1243,7 @@ gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer) gst_buffer_unref (buffer); if (tag->parse_mode != GST_ID3_TAG_PARSE_ANY) { /* seek to beginning */ - GST_LOG_OBJECT (tag, "seeking back to beginning (offset %d)", + GST_LOG_OBJECT (tag, "seeking back to beginning (offset %ld)", tag->v2tag_size); gst_id3_tag_set_state (tag, GST_ID3_TAG_STATE_SEEKING_TO_NORMAL); if (!gst_pad_push_event (tag->sinkpad, @@ -1276,7 +1276,7 @@ gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer) /* Collect a large enough chunk to read the tag */ if (GST_BUFFER_SIZE (buffer) < tag->v2tag_size) { GST_DEBUG_OBJECT (tag, - "Not enough data to read ID3v2. Need %d have %d, waiting for more", + "Not enough data to read ID3v2. Need %ld have %d, waiting for more", tag->v2tag_size, GST_BUFFER_SIZE (buffer)); tag->buffer = buffer; return GST_FLOW_OK; diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c index 3743c98917..5201ad2ccc 100644 --- a/ext/mad/gstmad.c +++ b/ext/mad/gstmad.c @@ -617,7 +617,7 @@ gst_mad_src_query (GstPad * pad, GstQuery * query) GST_TIME_ARGS (total)); } else { GST_LOG_OBJECT (mad, "duration=%" G_GINT64_FORMAT " (%s)", - gst_format_get_name (req_format)); + total, gst_format_get_name (req_format)); } break; } @@ -1348,7 +1348,7 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer) } /* append the chunk to process to our internal temporary buffer */ - GST_LOG ("tempbuffer size %d, copying %d bytes from incoming buffer", + GST_LOG ("tempbuffer size %ld, copying %d bytes from incoming buffer", mad->tempsize, tocopy); memcpy (mad->tempbuffer + mad->tempsize, data, tocopy); mad->tempsize += tocopy; @@ -1377,7 +1377,7 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer) GST_LOG ("decoding the header now"); if (mad_header_decode (&mad->frame.header, &mad->stream) == -1) { if (mad->stream.error == MAD_ERROR_BUFLEN) { - GST_LOG ("not enough data in tempbuffer (%d), breaking to get more", + GST_LOG ("not enough data in tempbuffer (%ld), breaking to get more", mad->tempsize); break; } else { @@ -1394,7 +1394,8 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer) /* not enough data, need to wait for next buffer? */ if (mad->stream.error == MAD_ERROR_BUFLEN) { if (mad->stream.next_frame == mad_input_buffer) { - GST_LOG ("not enough data in tempbuffer (%d), breaking to get more", + GST_LOG + ("not enough data in tempbuffer (%ld), breaking to get more", mad->tempsize); break; } else { diff --git a/ext/sidplay/gstsiddec.cc b/ext/sidplay/gstsiddec.cc index e202861488..fbed21e913 100644 --- a/ext/sidplay/gstsiddec.cc +++ b/ext/sidplay/gstsiddec.cc @@ -318,7 +318,7 @@ siddec_negotiate (GstSidDec * siddec) if (!allowed) goto nothing_allowed; - GST_DEBUG_OBJECT (siddec, "allowed caps: " GST_PTR_FORMAT, allowed); + GST_DEBUG_OBJECT (siddec, "allowed caps: %" GST_PTR_FORMAT, allowed); structure = gst_caps_get_structure (allowed, 0); diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c index 8942943ef3..27a47a7a6d 100644 --- a/gst/asfdemux/gstasfdemux.c +++ b/gst/asfdemux/gstasfdemux.c @@ -2614,7 +2614,7 @@ gst_asf_demux_parse_data (GstASFDemux * demux) data_left = (guint64) gst_adapter_available (demux->adapter); - GST_DEBUG ("STATE_HEADER, avail=%u:", data_left); + GST_DEBUG ("STATE_HEADER, avail=%u", (guint) data_left); data = (guint8 *) gst_adapter_peek (demux->adapter, data_left); diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c index 38a85d67cc..ce2780a7a1 100644 --- a/gst/realmedia/rmdemux.c +++ b/gst/realmedia/rmdemux.c @@ -815,9 +815,9 @@ gst_rmdemux_loop (GstPad * pad) GST_OBJECT_UNLOCK (rmdemux); return; } else { - GST_DEBUG_OBJECT (rmdemux, - "Unable to pull %d bytes at offset %p (pull_range returned %d, state is %d)", - (int) size, rmdemux->offset, ret, GST_STATE (rmdemux)); + GST_DEBUG_OBJECT (rmdemux, "Unable to pull %d bytes at offset 0x%08x " + "(pull_range returned flow %s, state is %d)", (gint) size, + rmdemux->offset, gst_flow_get_name (ret), GST_STATE (rmdemux)); goto need_pause; } } @@ -1944,7 +1944,7 @@ gst_rmdemux_parse_packet (GstRMDemux * rmdemux, const void *data, if ((rmdemux->offset + packet_size) <= stream->seek_offset) { GST_DEBUG_OBJECT (rmdemux, - "Stream %d is skipping: seek_offset=%d, offset=%d, packet_size", + "Stream %d is skipping: seek_offset=%d, offset=%d, packet_size=%u", stream->id, stream->seek_offset, rmdemux->offset, packet_size); cret = GST_FLOW_OK; goto beach;