From 7236a2f8b3fe9994017ea871f1d185b552b3d5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 10 Mar 2007 12:30:48 +0000 Subject: [PATCH] Printf format fixes; also add some missing quotes in translated strings. Fixes #416728 and #416727. Original commit message from CVS: * gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex), (gst_avi_demux_parse_index): * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_grab_frame): Printf format fixes; also add some missing quotes in translated strings. Fixes #416728 and #416727. --- ChangeLog | 9 +++++++++ gst/avi/gstavidemux.c | 20 ++++++++++---------- sys/v4l2/v4l2_calls.c | 6 +++--- sys/v4l2/v4l2src_calls.c | 4 ++-- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ed67c1f02..1ae9e2ffb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-03-10 Tim-Philipp Müller + + * gst/avi/gstavidemux.c: (gst_avi_demux_parse_subindex), + (gst_avi_demux_parse_index): + * sys/v4l2/v4l2_calls.c: (gst_v4l2_fill_lists): + * sys/v4l2/v4l2src_calls.c: (gst_v4l2src_grab_frame): + Printf format fixes; also add some missing quotes in translated + strings. Fixes #416728 and #416727. + 2007-03-09 Jan Schmidt * gst/autodetect/gstautoaudiosink.c: (gst_auto_audio_sink_find_best): diff --git a/gst/avi/gstavidemux.c b/gst/avi/gstavidemux.c index dfb726f13a..57cf84ed7d 100644 --- a/gst/avi/gstavidemux.c +++ b/gst/avi/gstavidemux.c @@ -1023,9 +1023,9 @@ not_implemented: out_of_mem: { GST_ELEMENT_ERROR (avi, RESOURCE, NO_SPACE_LEFT, (NULL), - ("Cannot allocate memory for %lu*%lu=%lu bytes", - sizeof (gst_avi_index_entry), num, - sizeof (gst_avi_index_entry) * num)); + ("Cannot allocate memory for %u*%u=%u bytes", + (guint) sizeof (gst_avi_index_entry), num, + (guint) sizeof (gst_avi_index_entry) * num)); gst_buffer_unref (buf); return FALSE; } @@ -1618,10 +1618,10 @@ gst_avi_demux_parse_index (GstAviDemux * avi, n++; } - GST_INFO - ("Parsed index, %6d entries, %5d keyframes, entry size = %2d, total size = %10ld", - num, _nr_keyframes, sizeof (gst_avi_index_entry), - num * sizeof (gst_avi_index_entry)); + GST_INFO ("Parsed index, %6d entries, %5ld keyframes, entry size = %2d, " + "total size = %10d", num, _nr_keyframes, + (gint) sizeof (gst_avi_index_entry), + (gint) (num * sizeof (gst_avi_index_entry))); gst_buffer_unref (buf); @@ -1636,9 +1636,9 @@ gst_avi_demux_parse_index (GstAviDemux * avi, out_of_mem: { GST_ELEMENT_ERROR (avi, RESOURCE, NO_SPACE_LEFT, (NULL), - ("Cannot allocate memory for %lu*%lu=%lu bytes", - sizeof (gst_avi_index_entry), num, - sizeof (gst_avi_index_entry) * num)); + ("Cannot allocate memory for %u*%u=%u bytes", + (guint) sizeof (gst_avi_index_entry), num, + (guint) sizeof (gst_avi_index_entry) * num)); gst_buffer_unref (buf); } } diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index bd791b9017..0721a2eaf9 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -123,7 +123,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) vtun.index = input.tuner; if (ioctl (v4l2object->video_fd, VIDIOC_G_TUNER, &vtun) < 0) { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed to get setting of tuner &d on device '%s'."), + (_("Failed to get setting of tuner %d on device '%s'."), input.tuner, v4l2object->videodev), GST_ERROR_SYSTEM); g_object_unref (G_OBJECT (channel)); return FALSE; @@ -211,7 +211,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; } else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed getting controls attributes on device '%s."), + (_("Failed getting controls attributes on device '%s.'"), v4l2object->videodev), ("Failed querying control %d on device '%s'. (%d - %s)", n, v4l2object->videodev, errno, strerror (errno))); @@ -282,7 +282,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; /* end of enumeration */ else { GST_ELEMENT_ERROR (v4l2object->element, RESOURCE, SETTINGS, - (_("Failed getting controls attributes on device '%s."), + (_("Failed getting controls attributes on device '%s'."), v4l2object->videodev), ("Failed to get %d in menu enumeration for %s. (%d - %s)", n, v4l2object->videodev, errno, strerror (errno))); diff --git a/sys/v4l2/v4l2src_calls.c b/sys/v4l2/v4l2src_calls.c index 7eef5471cb..756e3bffc1 100644 --- a/sys/v4l2/v4l2src_calls.c +++ b/sys/v4l2/v4l2src_calls.c @@ -160,7 +160,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l2src) while (ioctl (v4l2src->v4l2object->video_fd, VIDIOC_DQBUF, &buffer) < 0) { GST_LOG_OBJECT (v4l2src, - "problem grabbing frame %ld (ix=%ld), trials=%ld, pool-ct=%d, buf.flags=%d", + "problem grabbing frame %d (ix=%d), trials=%d, pool-ct=%d, buf.flags=%d", buffer.sequence, buffer.index, trials, v4l2src->pool->refcount, buffer.flags); @@ -221,7 +221,7 @@ gst_v4l2src_grab_frame (GstV4l2Src * v4l2src) } } - GST_LOG_OBJECT (v4l2src, "grabbed frame %ld (ix=%ld), pool-ct=%d", + GST_LOG_OBJECT (v4l2src, "grabbed frame %d (ix=%d), pool-ct=%d", buffer.sequence, buffer.index, v4l2src->pool->refcount); return buffer.index;