diff options
author | Sebastian Dröge <sebastian@centricular.com> | 2016-12-13 22:39:01 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2016-12-13 22:39:01 +0200 |
commit | 5c99f9cf37bab8dfb61296f15a602571846ae6d9 (patch) | |
tree | d411d862457dd46c216201e2564152ce6c0ca5a5 /tests | |
parent | 788bb676396a28bed4a6a423500a96a913708ed0 (diff) | |
download | gstreamer-plugins-bad-5c99f9cf37bab8dfb61296f15a602571846ae6d9.tar.gz |
gst: Don't declare variables inside the for loop header
This is a C99 feature.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/check/elements/adaptive_demux_common.c | 3 | ||||
-rw-r--r-- | tests/check/elements/adaptive_demux_engine.c | 8 | ||||
-rw-r--r-- | tests/check/elements/compositor.c | 3 | ||||
-rw-r--r-- | tests/check/elements/dash_demux.c | 7 | ||||
-rw-r--r-- | tests/check/elements/dash_mpd.c | 10 | ||||
-rw-r--r-- | tests/check/elements/hls_demux.c | 12 | ||||
-rw-r--r-- | tests/check/elements/mssdemux.c | 6 | ||||
-rw-r--r-- | tests/check/elements/test_http_src.c | 7 |
8 files changed, 39 insertions, 17 deletions
diff --git a/tests/check/elements/adaptive_demux_common.c b/tests/check/elements/adaptive_demux_common.c index 814b0eadc..ef0aa69f4 100644 --- a/tests/check/elements/adaptive_demux_common.c +++ b/tests/check/elements/adaptive_demux_common.c @@ -157,6 +157,7 @@ gst_adaptive_demux_test_check_received_data (GstAdaptiveDemuxTestEngine * guint64 streamOffset; GstAdaptiveDemuxTestCase *testData = GST_ADAPTIVE_DEMUX_TEST_CASE (user_data); GstAdaptiveDemuxTestExpectedOutput *testOutputStreamData; + guint64 i; fail_unless (stream != NULL); fail_unless (engine->pipeline != NULL); @@ -198,7 +199,7 @@ gst_adaptive_demux_test_check_received_data (GstAdaptiveDemuxTestEngine * gst_buffer_map (buffer, &info, GST_MAP_READ); pattern = streamOffset - streamOffset % sizeof (pattern); - for (guint64 i = 0; i != info.size; ++i) { + for (i = 0; i != info.size; ++i) { guint received = info.data[i]; guint expected; diff --git a/tests/check/elements/adaptive_demux_engine.c b/tests/check/elements/adaptive_demux_engine.c index b96983154..9228a43c3 100644 --- a/tests/check/elements/adaptive_demux_engine.c +++ b/tests/check/elements/adaptive_demux_engine.c @@ -54,7 +54,9 @@ static GstAdaptiveDemuxTestOutputStream * getTestOutputDataByAppsink (GstAdaptiveDemuxTestEnginePrivate * priv, GstAppSink * appsink) { - for (guint i = 0; i < priv->engine.output_streams->len; ++i) { + guint i; + + for (i = 0; i < priv->engine.output_streams->len; ++i) { GstAdaptiveDemuxTestOutputStream *state; state = g_ptr_array_index (priv->engine.output_streams, i); if (state->appsink == appsink) { @@ -70,7 +72,9 @@ static GstAdaptiveDemuxTestOutputStream * getTestOutputDataByPad (GstAdaptiveDemuxTestEnginePrivate * priv, GstPad * pad, gboolean abort_if_not_found) { - for (guint i = 0; i < priv->engine.output_streams->len; ++i) { + guint i; + + for (i = 0; i < priv->engine.output_streams->len; ++i) { GstAdaptiveDemuxTestOutputStream *stream; stream = g_ptr_array_index (priv->engine.output_streams, i); if (stream->internal_pad == pad || stream->pad == pad) { diff --git a/tests/check/elements/compositor.c b/tests/check/elements/compositor.c index cfd9ceaef..97211493d 100644 --- a/tests/check/elements/compositor.c +++ b/tests/check/elements/compositor.c @@ -443,8 +443,9 @@ static void add_interlaced_mode_to_caps (GstCaps * caps, const gchar * mode) { GstStructure *s; + gint i; - for (gint i = 0; i < gst_caps_get_size (caps); i++) { + for (i = 0; i < gst_caps_get_size (caps); i++) { s = gst_caps_get_structure (caps, i); gst_structure_set (s, "interlace-mode", G_TYPE_STRING, mode, NULL); } diff --git a/tests/check/elements/dash_demux.c b/tests/check/elements/dash_demux.c index 7cb1b93f3..84909746b 100644 --- a/tests/check/elements/dash_demux.c +++ b/tests/check/elements/dash_demux.c @@ -137,7 +137,9 @@ gst_dashdemux_http_src_start (GstTestHTTPSrc * src, { const GstTestHTTPSrcTestData *test_case = (const GstTestHTTPSrcTestData *) user_data; - for (guint i = 0; test_case->input[i].uri; ++i) { + guint i; + + for (i = 0; test_case->input[i].uri; ++i) { if (g_strcmp0 (test_case->input[i].uri, uri) == 0) { input_data->context = (gpointer) & test_case->input[i]; input_data->size = test_case->input[i].size; @@ -166,11 +168,12 @@ gst_dashdemux_http_src_create (GstTestHTTPSrc * src, } else { GstMapInfo info; guint pattern; + guint64 i; pattern = offset - offset % sizeof (pattern); gst_buffer_map (buf, &info, GST_MAP_WRITE); - for (guint64 i = 0; i < length; ++i) { + for (i = 0; i < length; ++i) { gchar pattern_byte_to_write = (offset + i) % sizeof (pattern); if (pattern_byte_to_write == 0) { pattern = offset + i; diff --git a/tests/check/elements/dash_mpd.c b/tests/check/elements/dash_mpd.c index 4018c9b7b..2ab6f9619 100644 --- a/tests/check/elements/dash_mpd.c +++ b/tests/check/elements/dash_mpd.c @@ -2572,7 +2572,9 @@ GST_START_TEST (dash_mpdparser_template_parsing) }; guint count = sizeof (testUrl) / sizeof (testUrl[0]); - for (int i = 0; i < count; i++) { + gint i; + + for (i = 0; i < count; i++) { result = gst_mpdparser_build_URL_from_template (testUrl[i].urlTemplate, id, number, bandwidth, time); @@ -3412,6 +3414,7 @@ GST_START_TEST (dash_mpdparser_get_audio_languages) gboolean ret; GstMpdClient *mpdclient = gst_mpd_client_new (); + gint i; ret = gst_mpd_parse (mpdclient, xml, (gint) strlen (xml)); assert_equals_int (ret, TRUE); @@ -3428,7 +3431,7 @@ GST_START_TEST (dash_mpdparser_get_audio_languages) /* setup streaming from all adaptation sets */ adaptationSetsCount = gst_mpdparser_get_nb_adaptationSet (mpdclient); - for (int i = 0; i < adaptationSetsCount; i++) { + for (i = 0; i < adaptationSetsCount; i++) { adapt_set = (GstAdaptationSetNode *) g_list_nth_data (adaptationSets, i); fail_if (adapt_set == NULL); ret = gst_mpd_client_setup_streaming (mpdclient, adapt_set); @@ -3463,6 +3466,7 @@ setup_mpd_client (const gchar * xml) guint adaptationSetsCount; gboolean ret; GstMpdClient *mpdclient = gst_mpd_client_new (); + gint i; ret = gst_mpd_parse (mpdclient, xml, (gint) strlen (xml)); assert_equals_int (ret, TRUE); @@ -3479,7 +3483,7 @@ setup_mpd_client (const gchar * xml) /* setup streaming from all adaptation sets */ adaptationSetsCount = gst_mpdparser_get_nb_adaptationSet (mpdclient); - for (int i = 0; i < adaptationSetsCount; i++) { + for (i = 0; i < adaptationSetsCount; i++) { adapt_set = (GstAdaptationSetNode *) g_list_nth_data (adaptationSets, i); fail_if (adapt_set == NULL); ret = gst_mpd_client_setup_streaming (mpdclient, adapt_set); diff --git a/tests/check/elements/hls_demux.c b/tests/check/elements/hls_demux.c index fca76b3e6..8f21af751 100644 --- a/tests/check/elements/hls_demux.c +++ b/tests/check/elements/hls_demux.c @@ -85,14 +85,16 @@ setup_test_variables (const gchar * funcname, GByteArray *mpeg_ts = NULL; if (segment_size) { + guint itd, otd; + mpeg_ts = generate_transport_stream ((segment_size)); fail_unless (mpeg_ts != NULL); - for (guint itd = 0; inputTestData[itd].uri; ++itd) { + for (itd = 0; inputTestData[itd].uri; ++itd) { if (g_str_has_suffix (inputTestData[itd].uri, ".ts")) { inputTestData[itd].payload = mpeg_ts->data; } } - for (guint otd = 0; outputTestData[otd].name; ++otd) { + for (otd = 0; outputTestData[otd].name; ++otd) { outputTestData[otd].expected_data = mpeg_ts->data; engineTestData->output_streams = g_list_append (engineTestData->output_streams, &outputTestData[otd]); @@ -181,9 +183,10 @@ gst_hlsdemux_test_src_start (GstTestHTTPSrc * src, const GstHlsDemuxTestCase *test_case = (const GstHlsDemuxTestCase *) user_data; guint fail_count = 0; + guint i; GST_DEBUG ("src_start %s", uri); - for (guint i = 0; test_case->input[i].uri; ++i) { + for (i = 0; test_case->input[i].uri; ++i) { if (strcmp (test_case->input[i].uri, uri) == 0) { gst_hlsdemux_test_set_input_data (test_case, &test_case->input[i], input_data); @@ -316,6 +319,7 @@ GST_START_TEST (testMasterPlaylist) {NULL, 0, NULL} }; const GValue *requests; + guint i; TESTCASE_INIT_BOILERPLATE (segment_size); http_src_callbacks.src_start = gst_hlsdemux_test_src_start; @@ -333,7 +337,7 @@ GST_START_TEST (testMasterPlaylist) fail_unless (requests != NULL); assert_equals_uint64 (gst_value_array_get_size (requests), sizeof (inputTestData) / sizeof (inputTestData[0]) - 1); - for (guint i = 0; inputTestData[i].uri; ++i) { + for (i = 0; inputTestData[i].uri; ++i) { const GValue *uri; uri = gst_value_array_get_value (requests, i); fail_unless (uri != NULL); diff --git a/tests/check/elements/mssdemux.c b/tests/check/elements/mssdemux.c index d5cc96c7a..cb8258b6a 100644 --- a/tests/check/elements/mssdemux.c +++ b/tests/check/elements/mssdemux.c @@ -44,9 +44,10 @@ gst_mssdemux_http_src_start (GstTestHTTPSrc * src, { const GstMssDemuxTestInputData *input = (const GstMssDemuxTestInputData *) user_data; + guint i; - for (guint i = 0; input[i].uri; ++i) { + for (i = 0; input[i].uri; ++i) { if (strcmp (input[i].uri, uri) == 0) { input_data->context = (gpointer) & input[i]; input_data->size = input[i].size; @@ -78,11 +79,12 @@ gst_mssdemux_http_src_create (GstTestHTTPSrc * src, } else { GstMapInfo info; guint pattern; + guint64 i; pattern = offset - offset % sizeof (pattern); gst_buffer_map (buf, &info, GST_MAP_WRITE); - for (guint64 i = 0; i < length; ++i) { + for (i = 0; i < length; ++i) { gchar pattern_byte_to_write = (offset + i) % sizeof (pattern); if (pattern_byte_to_write == 0) { pattern = offset + i; diff --git a/tests/check/elements/test_http_src.c b/tests/check/elements/test_http_src.c index 14f204314..baa1526dd 100644 --- a/tests/check/elements/test_http_src.c +++ b/tests/check/elements/test_http_src.c @@ -565,11 +565,13 @@ gst_test_http_src_set_property (GObject * object, guint prop_id, case PROP_KEEP_ALIVE: src->keep_alive = g_value_get_boolean (value); break; - case PROP_METHOD: + case PROP_METHOD:{ + guint i; + g_free (src->http_method_name); src->http_method_name = g_value_dup_string (value); src->http_method = METHOD_INVALID; - for (guint i = 0; gst_test_http_src_methods[i].name; ++i) { + for (i = 0; gst_test_http_src_methods[i].name; ++i) { if (strcmp (gst_test_http_src_methods[i].name, src->http_method_name) == 0) { src->http_method = gst_test_http_src_methods[i].method; @@ -581,6 +583,7 @@ gst_test_http_src_set_property (GObject * object, guint prop_id, trying to open a connection. */ break; + } default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; |