From 5f25780b02c34a479b143783f18d53a60dc03dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?UTF-8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Thu, 29 Apr 2010 04:42:21 +0400 Subject: [PATCH] Fix printf format strings for gcc 4.5 Done on Windows/MinGW. Fixes #617146 --- ext/kate/gstkateenc.c | 4 ++-- ext/kate/gstkatespu.c | 9 +++++---- ext/mpeg2enc/gstmpeg2encoptions.cc | 2 +- ext/timidity/gsttimidity.c | 2 +- gst/dccp/gstdccp.c | 4 ++-- sys/acmenc/acmenc.c | 4 ++-- sys/acmmp3dec/acmmp3dec.c | 2 +- sys/wininet/gstwininetsrc.c | 6 +++--- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ext/kate/gstkateenc.c b/ext/kate/gstkateenc.c index bc2ba2901c..7b46394ed1 100644 --- a/ext/kate/gstkateenc.c +++ b/ext/kate/gstkateenc.c @@ -1272,8 +1272,8 @@ gst_kate_enc_sink_event (GstPad * pad, GstEvent * event) NULL, NULL); if (format != GST_FORMAT_TIME || !GST_CLOCK_TIME_IS_VALID (timestamp)) { GST_WARNING_OBJECT (ke, - "No time in newsegment event %p, format %d, timestamp %lld", - event, (int) format, (long long) timestamp); + "No time in newsegment event %p, format %d, timestamp %" G_GINT64_FORMAT, + event, (int) format, timestamp); /* to be safe, we'd need to generate a keepalive anyway, but we'd have to guess at the timestamp to use; a good guess would be the last known timestamp plus the keepalive time, but if we then get a packet with a timestamp less than this, it would fail to encode, which would be Bad. If we don't encode a keepalive, we diff --git a/ext/kate/gstkatespu.c b/ext/kate/gstkatespu.c index 7218d1cdd4..8483525d87 100644 --- a/ext/kate/gstkatespu.c +++ b/ext/kate/gstkatespu.c @@ -240,7 +240,8 @@ gst_kate_spu_crop_bitmap (GstKateEnc * ke, kate_bitmap * kb, guint16 * dx, w = right - left + 1; h = bottom - top + 1; - GST_LOG_OBJECT (ke, "cropped from %zu %zu to %zu %zu", kb->width, kb->height, + GST_LOG_OBJECT (ke, "cropped from %" G_GSIZE_FORMAT " %" G_GSIZE_FORMAT + " to %" G_GSIZE_FORMAT " %" G_GSIZE_FORMAT, kb->width, kb->height, w, h); *dx += left; *dy += top; @@ -715,7 +716,7 @@ gst_kate_spu_encode_spu (GstKateDec * kd, const kate_event * ev) /* Allocate space to build the SPU */ bytes = g_malloc (MAX_SPU_SIZE); if (G_UNLIKELY (!bytes)) { - GST_WARNING_OBJECT (kd, "Failed to allocate %zu byte buffer", nbytes); + GST_WARNING_OBJECT (kd, "Failed to allocate %" G_GSIZE_FORMAT " byte buffer", nbytes); goto error; } nbytes = 4; @@ -860,7 +861,7 @@ gst_kate_spu_encode_spu (GstKateDec * kd, const kate_event * ev) /* Create a buffer with those values */ buffer = gst_buffer_new (); if (G_UNLIKELY (!buffer)) { - GST_WARNING_OBJECT (kd, "Failed to allocate %zu byte buffer", nbytes); + GST_WARNING_OBJECT (kd, "Failed to allocate %" G_GSIZE_FORMAT " byte buffer", nbytes); goto error; } GST_BUFFER_DATA (buffer) = bytes; @@ -871,7 +872,7 @@ gst_kate_spu_encode_spu (GstKateDec * kd, const kate_event * ev) GST_BUFFER_TIMESTAMP (buffer) = GST_SECOND * (ev->start_time); GST_BUFFER_DURATION (buffer) = GST_SECOND * (ev->end_time - ev->start_time); - GST_DEBUG_OBJECT (kd, "SPU uses %zu bytes", nbytes); + GST_DEBUG_OBJECT (kd, "SPU uses %" G_GSIZE_FORMAT " bytes", nbytes); kate_tracker_clear (&kin); return buffer; diff --git a/ext/mpeg2enc/gstmpeg2encoptions.cc b/ext/mpeg2enc/gstmpeg2encoptions.cc index 374f4d44e6..eedd3c4183 100644 --- a/ext/mpeg2enc/gstmpeg2encoptions.cc +++ b/ext/mpeg2enc/gstmpeg2encoptions.cc @@ -625,7 +625,7 @@ GstMpeg2EncOptions::setProperty (guint prop_id, const GValue * value) bitrate = g_value_get_int (value) * 1000; if (bitrate % 400 != 0) { bitrate = (bitrate / 400 + 1) * 400; - GST_INFO ("MPEG bitrate must be a multiple of 400", + GST_INFO ("MPEG bitrate must be a multiple of 400" " - rounded up to bitrate %d", bitrate / 1000); } break; diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c index 5b083892a8..1ead7a8b67 100644 --- a/ext/timidity/gsttimidity.c +++ b/ext/timidity/gsttimidity.c @@ -539,7 +539,7 @@ gst_timidity_fill_buffer (GstTimidity * timidity, GstBuffer * buffer) GST_DEBUG_OBJECT (timidity, "generated buffer %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT - " (%d samples)", + " (%" G_GINT64_FORMAT " samples)", GST_TIME_ARGS ((guint64) GST_BUFFER_TIMESTAMP (buffer)), GST_TIME_ARGS (((guint64) (GST_BUFFER_TIMESTAMP (buffer) + GST_BUFFER_DURATION (buffer)))), samples); diff --git a/gst/dccp/gstdccp.c b/gst/dccp/gstdccp.c index a556ca9b46..40ddac5e77 100644 --- a/gst/dccp/gstdccp.c +++ b/gst/dccp/gstdccp.c @@ -91,7 +91,7 @@ gst_dccp_read_buffer (GstElement * this, int socket, GstBuffer ** buf) fd_set testfds; int maxfdp1; int ret; - ssize_t bytes_read; + gssize bytes_read; #ifndef G_OS_WIN32 int readsize; struct msghdr mh; @@ -154,7 +154,7 @@ gst_dccp_read_buffer (GstElement * this, int socket, GstBuffer ** buf) return GST_FLOW_ERROR; } - GST_LOG_OBJECT (this, "bytes read %" G_GSIZE_FORMAT, bytes_read); + GST_LOG_OBJECT (this, "bytes read %" G_GSSIZE_FORMAT, bytes_read); GST_LOG_OBJECT (this, "returning buffer of size %d", GST_BUFFER_SIZE (*buf)); return GST_FLOW_OK; diff --git a/sys/acmenc/acmenc.c b/sys/acmenc/acmenc.c index 899e49c354..b2db28eba5 100644 --- a/sys/acmenc/acmenc.c +++ b/sys/acmenc/acmenc.c @@ -310,7 +310,7 @@ acmenc_push_output (ACMEnc * enc) enc->outfmt->nAvgBytesPerSec); } enc->bytes_output += enc->header.cbDstLengthUsed; - GST_DEBUG_OBJECT (enc, "Pushing %d byte encoded buffer", + GST_DEBUG_OBJECT (enc, "Pushing %lu byte encoded buffer", enc->header.cbDstLengthUsed); ret = gst_pad_push (enc->srcpad, outbuf); } @@ -594,7 +594,7 @@ acmenc_register (GstPlugin * plugin) wcscat (dirname, L"\\*.acm"); find = FindFirstFileW (dirname, &filedata); if (find == INVALID_HANDLE_VALUE) { - GST_WARNING ("Failed to find ACM files: %x", GetLastError ()); + GST_WARNING ("Failed to find ACM files: %lx", GetLastError ()); return FALSE; } diff --git a/sys/acmmp3dec/acmmp3dec.c b/sys/acmmp3dec/acmmp3dec.c index e0fa020cea..2f27992706 100644 --- a/sys/acmmp3dec/acmmp3dec.c +++ b/sys/acmmp3dec/acmmp3dec.c @@ -259,7 +259,7 @@ acmmp3dec_push_output (ACMMP3Dec * dec) if (dec->timestamp != GST_CLOCK_TIME_NONE) dec->timestamp += GST_BUFFER_DURATION (outbuf); - GST_DEBUG_OBJECT (dec, "Pushing %d byte decoded buffer", + GST_DEBUG_OBJECT (dec, "Pushing %lu byte decoded buffer", dec->header.cbDstLengthUsed); ret = gst_pad_push (dec->srcpad, outbuf); } else diff --git a/sys/wininet/gstwininetsrc.c b/sys/wininet/gstwininetsrc.c index 24b719c401..b29b4de74b 100644 --- a/sys/wininet/gstwininetsrc.c +++ b/sys/wininet/gstwininetsrc.c @@ -271,7 +271,7 @@ gst_win_inet_src_get_header_value_as_int (GstWinInetSrc * self, error_str = "ERROR_HTTP_HEADER_NOT_FOUND"; GST_WARNING_OBJECT (self, "HttpQueryInfo for header '%s' failed: %s " - "(0x%08x)", header_name, error_str, error_code); + "(0x%08lx)", header_name, error_str, error_code); } return FALSE; @@ -314,7 +314,7 @@ gst_win_inet_src_open (GstWinInetSrc * self) error: GST_ELEMENT_ERROR (self, RESOURCE, NOT_FOUND, (NULL), - ("Could not open location \"%s\" for reading: 0x%08x", + ("Could not open location \"%s\" for reading: 0x%08lx", self->location, GetLastError ())); gst_win_inet_src_reset (self); @@ -372,7 +372,7 @@ gst_win_inet_src_create (GstPushSrc * pushsrc, GstBuffer ** buffer) } } } else { - GST_ERROR_OBJECT (self, "InternetReadFile failed: 0x%08x", + GST_ERROR_OBJECT (self, "InternetReadFile failed: 0x%08lx", GetLastError ()); ret = GST_FLOW_ERROR;