From 5d0015048bbf8345ac930ec5c8a03685790ae104 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 15 Jul 2010 15:46:24 +0300 Subject: [PATCH] check: don't use c++ keywords as variable names --- libs/gst/check/gstcheck.c | 16 ++++++++-------- libs/gst/check/gstcheck.h | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libs/gst/check/gstcheck.c b/libs/gst/check/gstcheck.c index 417cc21619..0849dcebc9 100644 --- a/libs/gst/check/gstcheck.c +++ b/libs/gst/check/gstcheck.c @@ -201,11 +201,11 @@ gst_check_teardown_element (GstElement * element) */ GstPad * gst_check_setup_src_pad (GstElement * element, - GstStaticPadTemplate * template, GstCaps * caps) + GstStaticPadTemplate * tmpl, GstCaps * caps) { GstPad *srcpad; - srcpad = gst_check_setup_src_pad_by_name (element, template, "sink"); + srcpad = gst_check_setup_src_pad_by_name (element, tmpl, "sink"); if (caps) fail_unless (gst_pad_set_caps (srcpad, caps), "could not set caps on pad"); return srcpad; @@ -213,12 +213,12 @@ gst_check_setup_src_pad (GstElement * element, GstPad * gst_check_setup_src_pad_by_name (GstElement * element, - GstStaticPadTemplate * template, const gchar * name) + GstStaticPadTemplate * tmpl, const gchar * name) { GstPad *srcpad, *sinkpad; /* sending pad */ - srcpad = gst_pad_new_from_static_template (template, "src"); + srcpad = gst_pad_new_from_static_template (tmpl, "src"); GST_DEBUG_OBJECT (element, "setting up sending pad %p", srcpad); fail_if (srcpad == NULL, "Could not create a srcpad"); ASSERT_OBJECT_REFCOUNT (srcpad, "srcpad", 1); @@ -279,12 +279,12 @@ gst_check_teardown_src_pad (GstElement * element) /* FIXME: set_caps isn't that useful; might want to check if fixed, * then use set_use_fixed or somesuch */ GstPad * -gst_check_setup_sink_pad (GstElement * element, GstStaticPadTemplate * template, +gst_check_setup_sink_pad (GstElement * element, GstStaticPadTemplate * tmpl, GstCaps * caps) { GstPad *sinkpad; - sinkpad = gst_check_setup_sink_pad_by_name (element, template, "src"); + sinkpad = gst_check_setup_sink_pad_by_name (element, tmpl, "src"); if (caps) fail_unless (gst_pad_set_caps (sinkpad, caps), "Could not set pad caps"); return sinkpad; @@ -292,12 +292,12 @@ gst_check_setup_sink_pad (GstElement * element, GstStaticPadTemplate * template, GstPad * gst_check_setup_sink_pad_by_name (GstElement * element, - GstStaticPadTemplate * template, const gchar * name) + GstStaticPadTemplate * tmpl, const gchar * name) { GstPad *srcpad, *sinkpad; /* receiving pad */ - sinkpad = gst_pad_new_from_static_template (template, "sink"); + sinkpad = gst_pad_new_from_static_template (tmpl, "sink"); GST_DEBUG_OBJECT (element, "setting up receiving pad %p", sinkpad); fail_if (sinkpad == NULL, "Could not create a sinkpad"); diff --git a/libs/gst/check/gstcheck.h b/libs/gst/check/gstcheck.h index 5812b51087..3e84b84916 100644 --- a/libs/gst/check/gstcheck.h +++ b/libs/gst/check/gstcheck.h @@ -72,11 +72,11 @@ void gst_check_message_error (GstMessage * message, GstMessageType type, GstElement *gst_check_setup_element (const gchar * factory); void gst_check_teardown_element (GstElement * element); GstPad *gst_check_setup_src_pad (GstElement * element, - GstStaticPadTemplate * template, GstCaps * caps); + GstStaticPadTemplate * tmpl, GstCaps * caps); GstPad * gst_check_setup_src_pad_by_name (GstElement * element, - GstStaticPadTemplate * template, const gchar *name); + GstStaticPadTemplate * tmpl, const gchar *name); GstPad * gst_check_setup_sink_pad_by_name (GstElement * element, - GstStaticPadTemplate * template, const gchar *name); + GstStaticPadTemplate * tmpl, const gchar *name); void gst_check_teardown_pad_by_name (GstElement * element, const gchar *name); void gst_check_teardown_src_pad (GstElement * element); void gst_check_drop_buffers (void); @@ -86,7 +86,7 @@ void gst_check_element_push_buffer_list (const gchar * element_name, void gst_check_element_push_buffer (const gchar * element_name, GstBuffer * buffer_in, GstBuffer * buffer_out); GstPad *gst_check_setup_sink_pad (GstElement * element, - GstStaticPadTemplate * template, GstCaps * caps); + GstStaticPadTemplate * tmpl, GstCaps * caps); void gst_check_teardown_sink_pad (GstElement * element); void gst_check_abi_list (GstCheckABIStruct list[], gboolean have_abi_sizes); gint gst_check_run_suite (Suite * suite, const gchar * name,