From f468db236d5d7fcb4f5df7fda7e3baba4550df3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 5 Oct 2006 14:26:08 +0000 Subject: [PATCH] Printf fixes. Original commit message from CVS: * gst/gstpad.c: (pre_activate): * gst/gstregistry.c: (gst_registry_scan_path_level): * gst/gstregistryxml.c: (load_plugin): * libs/gst/controller/gstcontroller.c: (gst_controlled_property_set_interpolation_mode): * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_packet_from_event_1_0): * libs/gst/net/gstnetclientclock.c: (gst_net_client_clock_observe_times): * plugins/elements/gstfdsrc.c: (gst_fd_src_create): Printf fixes. --- ChangeLog | 14 ++++++++++++++ gst/gstpad.c | 3 +-- gst/gstregistry.c | 6 +++--- gst/gstregistryxml.c | 2 +- libs/gst/controller/gstcontroller.c | 2 +- libs/gst/dataprotocol/dataprotocol.c | 2 +- libs/gst/net/gstnetclientclock.c | 4 ++-- plugins/elements/gstfdsrc.c | 2 +- 8 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index adaf2895e9..b1fa64945d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-10-05 Tim-Philipp Müller + + * gst/gstpad.c: (pre_activate): + * gst/gstregistry.c: (gst_registry_scan_path_level): + * gst/gstregistryxml.c: (load_plugin): + * libs/gst/controller/gstcontroller.c: + (gst_controlled_property_set_interpolation_mode): + * libs/gst/dataprotocol/dataprotocol.c: + (gst_dp_packet_from_event_1_0): + * libs/gst/net/gstnetclientclock.c: + (gst_net_client_clock_observe_times): + * plugins/elements/gstfdsrc.c: (gst_fd_src_create): + Printf fixes. + 2006-10-05 Tim-Philipp Müller * configure.ac: diff --git a/gst/gstpad.c b/gst/gstpad.c index 4f643865e4..4d5280e572 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -575,8 +575,7 @@ pre_activate (GstPad * pad, GstActivateMode new_mode) break; case GST_ACTIVATE_NONE: GST_OBJECT_LOCK (pad); - GST_DEBUG_OBJECT (pad, "setting ACTIVATE_MODE NONE, set flushing", - new_mode); + GST_DEBUG_OBJECT (pad, "setting ACTIVATE_MODE NONE, set flushing"); GST_PAD_SET_FLUSHING (pad); /* unlock blocked pads so element can resume and stop */ GST_PAD_BLOCK_SIGNAL (pad); diff --git a/gst/gstregistry.c b/gst/gstregistry.c index 503690e0ca..244e77c2d3 100644 --- a/gst/gstregistry.c +++ b/gst/gstregistry.c @@ -857,9 +857,9 @@ gst_registry_scan_path_level (GstRegistry * registry, const gchar * path, } else { GST_INFO_OBJECT (registry, "cached info for %s is stale", filename); GST_DEBUG_OBJECT (registry, "mtime %ld != %ld or size %" - G_GSIZE_FORMAT " != %" - G_GSIZE_FORMAT, plugin->file_mtime, file_status.st_mtime, - plugin->file_size, file_status.st_size); + G_GINT64_FORMAT " != %" + G_GINT64_FORMAT, plugin->file_mtime, file_status.st_mtime, + (gint64) plugin->file_size, (gint64) file_status.st_size); gst_registry_remove_plugin (gst_registry_get_default (), plugin); newplugin = gst_plugin_load_file (filename, NULL); if (newplugin) { diff --git a/gst/gstregistryxml.c b/gst/gstregistryxml.c index 2e5a154c62..eebbd8fc76 100644 --- a/gst/gstregistryxml.c +++ b/gst/gstregistryxml.c @@ -452,7 +452,7 @@ load_plugin (xmlTextReaderPtr reader, GList ** feature_list) if (read_uint (reader, &x)) { plugin->file_size = x; - GST_DEBUG ("file_size %d", plugin->file_size); + GST_DEBUG ("file_size %" G_GINT64_FORMAT, (gint64) plugin->file_size); } else { GST_DEBUG ("failed to read size"); } diff --git a/libs/gst/controller/gstcontroller.c b/libs/gst/controller/gstcontroller.c index acb73d864d..ccf6c27525 100644 --- a/libs/gst/controller/gstcontroller.c +++ b/libs/gst/controller/gstcontroller.c @@ -234,7 +234,7 @@ gst_controlled_property_set_interpolation_mode (GstControlledProperty * self, self->get_value_array = NULL; } if (!self->get) { /* || !self->get_value_array) */ - GST_WARNING ("incomplete implementation for type %d/%d:'%s'/'%s'", + GST_WARNING ("incomplete implementation for type %lu/%lu:'%s'/'%s'", self->type, self->base, g_type_name (self->type), g_type_name (self->base)); res = FALSE; diff --git a/libs/gst/dataprotocol/dataprotocol.c b/libs/gst/dataprotocol/dataprotocol.c index 7b9ec2b355..949fd729f1 100644 --- a/libs/gst/dataprotocol/dataprotocol.c +++ b/libs/gst/dataprotocol/dataprotocol.c @@ -545,7 +545,7 @@ gst_dp_packet_from_event_1_0 (const GstEvent * event, GstDPHeaderFlag flags, GST_LOG ("event %p has structure, string %s", event, string); pl_length = strlen ((gchar *) string) + 1; /* include trailing 0 */ } else { - GST_LOG ("event %p has no structure"); + GST_LOG ("event %p has no structure", event); pl_length = 0; } diff --git a/libs/gst/net/gstnetclientclock.c b/libs/gst/net/gstnetclientclock.c index b3b3f22dde..1742330f0e 100644 --- a/libs/gst/net/gstnetclientclock.c +++ b/libs/gst/net/gstnetclientclock.c @@ -292,8 +292,8 @@ gst_net_client_clock_observe_times (GstNetClientClock * self, bogus_observation: { - GST_WARNING_OBJECT (self, "time packet receive time < send time (%", - GST_TIME_FORMAT, " < %" GST_TIME_FORMAT ")", GST_TIME_ARGS (local_1), + GST_WARNING_OBJECT (self, "time packet receive time < send time (%" + GST_TIME_FORMAT " < %" GST_TIME_FORMAT ")", GST_TIME_ARGS (local_1), GST_TIME_ARGS (local_2)); return; } diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c index 6e9cdfbcd0..77c5bd2e44 100644 --- a/plugins/elements/gstfdsrc.c +++ b/plugins/elements/gstfdsrc.c @@ -372,7 +372,7 @@ gst_fd_src_create (GstPushSrc * psrc, GstBuffer ** outbuf) GST_BUFFER_TIMESTAMP (buf) = GST_CLOCK_TIME_NONE; src->curoffset += readbytes; - GST_LOG_OBJECT (psrc, "Read buffer of size %u.", readbytes); + GST_LOG_OBJECT (psrc, "Read buffer of size %ld", readbytes); /* we're done, return the buffer */ *outbuf = buf;