summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-07 22:49:01 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-06-08 17:13:17 +0100
commit998b2392d3c4ca5fdd89ed5ee0b730a4b20e490e (patch)
tree047e4d645d7681acf5862d23e225c80f998cdac0
parent89c42f8506ae8041573310b60fd27f8bf7010e0e (diff)
downloadgstreamer-998b2392d3c4ca5fdd89ed5ee0b730a4b20e490e.tar.gz
Remove double semicolons at end of line
-rw-r--r--gst/gsturi.c2
-rw-r--r--gst/gstvalue.c12
-rw-r--r--tests/check/gst/gstsystemclock.c2
-rw-r--r--tests/check/libs/transform1.c80
4 files changed, 48 insertions, 48 deletions
diff --git a/gst/gsturi.c b/gst/gsturi.c
index 5c0c91c488..d5c301de45 100644
--- a/gst/gsturi.c
+++ b/gst/gsturi.c
@@ -447,7 +447,7 @@ gst_uri_get_location (const gchar * uri)
#endif
GST_LOG ("extracted location '%s' from URI '%s'", GST_STR_NULL (unescaped),
- uri);;
+ uri);
return unescaped;
}
diff --git a/gst/gstvalue.c b/gst/gstvalue.c
index 48086f0fa7..e7a3c564d6 100644
--- a/gst/gstvalue.c
+++ b/gst/gstvalue.c
@@ -2634,7 +2634,7 @@ gst_value_subtract_from_list (GValue * dest, const GValue * minuend,
gboolean ret = FALSE;
GType ltype;
- ltype = gst_value_list_get_type ();;
+ ltype = gst_value_list_get_type ();
size = gst_value_list_get_size (minuend);
for (i = 0; i < size; i++) {
@@ -3024,7 +3024,7 @@ gst_value_can_intersect (const GValue * value1, const GValue * value2)
guint i;
GType ltype, type1, type2;
- ltype = gst_value_list_get_type ();;
+ ltype = gst_value_list_get_type ();
/* special cases */
if (G_VALUE_HOLDS (value1, ltype) || G_VALUE_HOLDS (value2, ltype))
@@ -3066,7 +3066,7 @@ gst_value_intersect (GValue * dest, const GValue * value1,
guint i;
GType ltype, type1, type2;
- ltype = gst_value_list_get_type ();;
+ ltype = gst_value_list_get_type ();
/* special cases first */
if (G_VALUE_HOLDS (value1, ltype))
@@ -3144,7 +3144,7 @@ gst_value_subtract (GValue * dest, const GValue * minuend,
guint i;
GType ltype, mtype, stype;
- ltype = gst_value_list_get_type ();;
+ ltype = gst_value_list_get_type ();
/* special cases first */
if (G_VALUE_HOLDS (minuend, ltype))
@@ -3200,7 +3200,7 @@ gst_value_can_subtract (const GValue * minuend, const GValue * subtrahend)
guint i;
GType ltype, mtype, stype;
- ltype = gst_value_list_get_type ();;
+ ltype = gst_value_list_get_type ();
/* special cases */
if (G_VALUE_HOLDS (minuend, ltype) || G_VALUE_HOLDS (subtrahend, ltype))
@@ -4190,7 +4190,7 @@ _gst_value_initialize (void)
gst_value_deserialize_array,
};
- gst_value.type = gst_value_array_get_type ();;
+ gst_value.type = gst_value_array_get_type ();
gst_value_register (&gst_value);
}
diff --git a/tests/check/gst/gstsystemclock.c b/tests/check/gst/gstsystemclock.c
index 53cb5779b1..ba0a2a3961 100644
--- a/tests/check/gst/gstsystemclock.c
+++ b/tests/check/gst/gstsystemclock.c
@@ -263,7 +263,7 @@ GST_START_TEST (test_async_order)
GstClockTime base;
GstClockReturn result;
- store_lock = g_mutex_new ();;
+ store_lock = g_mutex_new ();
clock = gst_system_clock_obtain ();
fail_unless (clock != NULL, "Could not create instance of GstSystemClock");
diff --git a/tests/check/libs/transform1.c b/tests/check/libs/transform1.c
index a3efb5ddcd..67d22fc4e7 100644
--- a/tests/check/libs/transform1.c
+++ b/tests/check/libs/transform1.c
@@ -76,7 +76,7 @@ GST_START_TEST (basetransform_chain_pt1)
buffer = gst_buffer_new_and_alloc (20);
buffer_alloc_pt1_called = FALSE;
- set_caps_pt1_called = FALSE;;
+ set_caps_pt1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
/* FIXME, passthough without pad-alloc, do pad-alloc on the srcpad */
@@ -95,7 +95,7 @@ GST_START_TEST (basetransform_chain_pt1)
buffer = gst_buffer_new_and_alloc (10);
buffer_alloc_pt1_called = FALSE;
- set_caps_pt1_called = FALSE;;
+ set_caps_pt1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
/* FIXME, passthough without pad-alloc, do pad-alloc on the srcpad */
@@ -114,7 +114,7 @@ GST_START_TEST (basetransform_chain_pt1)
GST_DEBUG_OBJECT (trans, "alloc without caps, size 20");
buffer_alloc_pt1_called = FALSE;
- set_caps_pt1_called = FALSE;;
+ set_caps_pt1_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 20, NULL, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_pt1_called == TRUE);
@@ -126,7 +126,7 @@ GST_START_TEST (basetransform_chain_pt1)
caps = gst_caps_new_simple ("foo/x-bar", NULL);
buffer_alloc_pt1_called = FALSE;
- set_caps_pt1_called = FALSE;;
+ set_caps_pt1_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 10, caps, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_pt1_called == TRUE);
@@ -135,7 +135,7 @@ GST_START_TEST (basetransform_chain_pt1)
/* once more */
buffer_alloc_pt1_called = FALSE;
- set_caps_pt1_called = FALSE;;
+ set_caps_pt1_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 10, caps, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_pt1_called == TRUE);
@@ -207,7 +207,7 @@ GST_START_TEST (basetransform_chain_pt2)
GST_DEBUG_OBJECT (trans, "alloc with caps, size 20");
buffer_alloc_pt1_called = FALSE;
- set_caps_pt2_called = FALSE;;
+ set_caps_pt2_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 20, caps, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_pt1_called == TRUE);
@@ -247,7 +247,7 @@ GST_START_TEST (basetransform_chain_pt2)
GST_DEBUG_OBJECT (trans, "alloc with caps, size 20");
buffer_alloc_pt1_called = FALSE;
- set_caps_pt2_called = FALSE;;
+ set_caps_pt2_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 20, caps, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_pt1_called == TRUE);
@@ -262,7 +262,7 @@ GST_START_TEST (basetransform_chain_pt2)
GST_DEBUG_OBJECT (trans, "alloc with superset caps, size 20");
buffer_alloc_pt1_called = FALSE;
- set_caps_pt2_called = FALSE;;
+ set_caps_pt2_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 20, caps, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_pt1_called == TRUE);
@@ -308,8 +308,8 @@ GST_START_TEST (basetransform_chain_ip1)
buffer = gst_buffer_new_and_alloc (20);
- transform_ip_1_called = FALSE;;
- transform_ip_1_writable = TRUE;;
+ transform_ip_1_called = FALSE;
+ transform_ip_1_writable = TRUE;
buffer_alloc_pt1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -331,8 +331,8 @@ GST_START_TEST (basetransform_chain_ip1)
fail_unless (GST_MINI_OBJECT_REFCOUNT_VALUE (buffer) == 2);
- transform_ip_1_called = FALSE;;
- transform_ip_1_writable = FALSE;;
+ transform_ip_1_called = FALSE;
+ transform_ip_1_writable = FALSE;
buffer_alloc_pt1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -430,10 +430,10 @@ GST_START_TEST (basetransform_chain_ip2)
GST_DEBUG_OBJECT (trans, "buffer without caps, size 20");
- transform_ip_1_called = FALSE;;
- transform_ip_1_writable = FALSE;;
+ transform_ip_1_called = FALSE;
+ transform_ip_1_writable = FALSE;
buffer_alloc_pt1_called = FALSE;
- set_caps_1_called = FALSE;;
+ set_caps_1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_NOT_NEGOTIATED);
fail_unless (transform_ip_1_called == FALSE);
@@ -449,7 +449,7 @@ GST_START_TEST (basetransform_chain_ip2)
transform_ip_1_called = FALSE;
transform_ip_1_writable = FALSE;
- set_caps_1_called = FALSE;;
+ set_caps_1_called = FALSE;
buffer_alloc_pt1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -487,8 +487,8 @@ GST_START_TEST (basetransform_chain_ip2)
fail_unless (GST_MINI_OBJECT_REFCOUNT_VALUE (buffer) == 2);
- transform_ip_1_called = FALSE;;
- transform_ip_1_writable = FALSE;;
+ transform_ip_1_called = FALSE;
+ transform_ip_1_writable = FALSE;
buffer_alloc_pt1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -548,7 +548,7 @@ set_caps_ct1 (GstBaseTransform * trans, GstCaps * incaps, GstCaps * outcaps)
fail_unless (gst_caps_is_equal (incaps, caps1));
fail_unless (gst_caps_is_equal (outcaps, caps2));
- set_caps_ct1_called = TRUE;;
+ set_caps_ct1_called = TRUE;
gst_caps_unref (caps1);
gst_caps_unref (caps2);
@@ -678,9 +678,9 @@ GST_START_TEST (basetransform_chain_ct1)
GST_DEBUG_OBJECT (trans, "buffer without caps");
- transform_ct1_called = FALSE;;
- transform_ct1_writable = FALSE;;
- set_caps_ct1_called = FALSE;;
+ transform_ct1_called = FALSE;
+ transform_ct1_writable = FALSE;
+ set_caps_ct1_called = FALSE;
buffer_alloc_ct1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_NOT_NEGOTIATED);
@@ -697,7 +697,7 @@ GST_START_TEST (basetransform_chain_ct1)
transform_ct1_called = FALSE;
transform_ct1_writable = FALSE;
- set_caps_ct1_called = FALSE;;
+ set_caps_ct1_called = FALSE;
buffer_alloc_ct1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -721,8 +721,8 @@ GST_START_TEST (basetransform_chain_ct1)
GST_DEBUG_OBJECT (trans, "buffer with caps %" GST_PTR_FORMAT, incaps);
- transform_ct1_called = FALSE;;
- transform_ct1_writable = FALSE;;
+ transform_ct1_called = FALSE;
+ transform_ct1_writable = FALSE;
buffer_alloc_ct1_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -797,7 +797,7 @@ set_caps_ct2 (GstBaseTransform * trans, GstCaps * incaps, GstCaps * outcaps)
fail_unless (gst_caps_is_equal (incaps, caps1));
fail_unless (gst_caps_is_equal (outcaps, caps2));
- set_caps_ct2_called = TRUE;;
+ set_caps_ct2_called = TRUE;
gst_caps_unref (caps1);
gst_caps_unref (caps2);
@@ -958,9 +958,9 @@ GST_START_TEST (basetransform_chain_ct2)
GST_DEBUG_OBJECT (trans, "buffer without caps");
- transform_ct2_called = FALSE;;
- transform_ct2_writable = FALSE;;
- set_caps_ct2_called = FALSE;;
+ transform_ct2_called = FALSE;
+ transform_ct2_writable = FALSE;
+ set_caps_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_NOT_NEGOTIATED);
@@ -979,7 +979,7 @@ GST_START_TEST (basetransform_chain_ct2)
set_caps_ct2_case = 1;
transform_ct2_called = FALSE;
transform_ct2_writable = FALSE;
- set_caps_ct2_called = FALSE;;
+ set_caps_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -1003,8 +1003,8 @@ GST_START_TEST (basetransform_chain_ct2)
GST_DEBUG_OBJECT (trans, "buffer with caps %" GST_PTR_FORMAT, incaps);
- transform_ct2_called = FALSE;;
- transform_ct2_writable = FALSE;;
+ transform_ct2_called = FALSE;
+ transform_ct2_writable = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -1111,9 +1111,9 @@ GST_START_TEST (basetransform_chain_ct3)
GST_DEBUG_OBJECT (trans, "buffer without caps");
- transform_ct2_called = FALSE;;
- transform_ct2_writable = FALSE;;
- set_caps_ct2_called = FALSE;;
+ transform_ct2_called = FALSE;
+ transform_ct2_writable = FALSE;
+ set_caps_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_NOT_NEGOTIATED);
@@ -1131,7 +1131,7 @@ GST_START_TEST (basetransform_chain_ct3)
buffer_alloc_ct2_case = 1;
set_caps_ct2_case = 1;
transform_ct2_called = FALSE;
- set_caps_ct2_called = FALSE;;
+ set_caps_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -1154,7 +1154,7 @@ GST_START_TEST (basetransform_chain_ct3)
GST_DEBUG_OBJECT (trans, "buffer with caps %" GST_PTR_FORMAT, incaps);
- transform_ct2_called = FALSE;;
+ transform_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -1205,7 +1205,7 @@ GST_START_TEST (basetransform_chain_ct3)
/* don't suggest anything else */
buffer_alloc_ct2_case = 1;
set_caps_ct2_case = 2;
- transform_ct2_called = FALSE;;
+ transform_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);
@@ -1232,7 +1232,7 @@ GST_START_TEST (basetransform_chain_ct3)
set_caps_ct2_case = 0;
buffer_alloc_ct2_case = 1;
buffer_alloc_ct2_called = FALSE;
- set_caps_ct2_called = FALSE;;
+ set_caps_ct2_called = FALSE;
res = gst_pad_alloc_buffer (trans->srcpad, 0, 10, incaps, &buffer);
fail_unless (res == GST_FLOW_OK);
fail_unless (buffer_alloc_ct2_called == TRUE);
@@ -1251,7 +1251,7 @@ GST_START_TEST (basetransform_chain_ct3)
/* don't suggest anything else */
buffer_alloc_ct2_suggest = FALSE;
buffer_alloc_ct2_case = 0;
- transform_ct2_called = FALSE;;
+ transform_ct2_called = FALSE;
buffer_alloc_ct2_called = FALSE;
res = gst_test_trans_push (trans, buffer);
fail_unless (res == GST_FLOW_OK);