From 84512152c1490522c46090a81f244a8a6ac0d1b4 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 28 Nov 2018 05:58:53 +0200 Subject: [PATCH] Run gst-indent through the files This is required before we enabled an indent test in the CI. https://gitlab.freedesktop.org/gstreamer/gstreamer-project/issues/33 --- gst/gstsystemclock.c | 3 ++- libs/gst/check/libcheck/check.c | 4 ++-- plugins/elements/gstfdsink.c | 2 +- tests/benchmarks/capsnego.c | 14 +++++++++----- tests/check/gst/gstpad.c | 2 +- tests/check/gst/gsturi.c | 4 ++-- 6 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index c5260f2..73dbfb4 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -582,7 +582,8 @@ gst_system_clock_get_internal_time (GstClock * clock) /* we prefer the highly accurate performance counters on windows */ QueryPerformanceCounter (&now); - return ((now.QuadPart - sysclock->priv->start.QuadPart) * sysclock->priv->ratio); + return ((now.QuadPart - + sysclock->priv->start.QuadPart) * sysclock->priv->ratio); } else #endif /* G_OS_WIN32 */ #if !defined HAVE_POSIX_TIMERS || !defined HAVE_CLOCK_GETTIME diff --git a/libs/gst/check/libcheck/check.c b/libs/gst/check/libcheck/check.c index 5b8c434..3bf7bfe 100644 --- a/libs/gst/check/libcheck/check.c +++ b/libs/gst/check/libcheck/check.c @@ -52,7 +52,7 @@ int check_major_version = CHECK_MAJOR_VERSION; int check_minor_version = CHECK_MINOR_VERSION; int check_micro_version = CHECK_MICRO_VERSION; -const char* current_test_name = NULL; +const char *current_test_name = NULL; static int non_pass (int val); static Fixture *fixture_create (SFun fun, int ischecked); @@ -342,7 +342,7 @@ tcase_fn_start (const char *fname, const char *file, int line) { send_ctx_info (CK_CTX_TEST); send_loc_info (file, line); - + current_test_name = fname; } diff --git a/plugins/elements/gstfdsink.c b/plugins/elements/gstfdsink.c index 54a169b..7641cde 100644 --- a/plugins/elements/gstfdsink.c +++ b/plugins/elements/gstfdsink.c @@ -69,7 +69,7 @@ #define off_t guint64 #endif -#if defined(__BIONIC__) /* Android */ +#if defined(__BIONIC__) /* Android */ #if defined(__ANDROID_API__) && __ANDROID_API__ >= 21 #undef fstat #define fstat fstat64 diff --git a/tests/benchmarks/capsnego.c b/tests/benchmarks/capsnego.c index 5a7a390..cf6d721 100644 --- a/tests/benchmarks/capsnego.c +++ b/tests/benchmarks/capsnego.c @@ -185,7 +185,7 @@ gint main (gint argc, gchar * argv[]) { /* default parameters */ - gchar *flavour_str = g_strdup("audio"); + gchar *flavour_str = g_strdup ("audio"); gint flavour = FLAVOUR_AUDIO; gint children = 3; gint depth = 4; @@ -194,14 +194,18 @@ main (gint argc, gchar * argv[]) GOptionContext *ctx; GOptionEntry options[] = { {"children", 'c', 0, G_OPTION_ARG_INT, &children, - "Number of children (branches on each level) (default: 3)", NULL}, + "Number of children (branches on each level) (default: 3)", NULL} + , {"depth", 'd', 0, G_OPTION_ARG_INT, &depth, - "Depth of pipeline hierarchy tree (default: 4)", NULL}, + "Depth of pipeline hierarchy tree (default: 4)", NULL} + , {"flavour", 'f', 0, G_OPTION_ARG_STRING, &flavour_str, "Flavour (video|audio) controlling the kind of elements used " - "(default: audio)", NULL}, + "(default: audio)", NULL} + , {"loops", 'l', 0, G_OPTION_ARG_INT, &loops, - "How many loops to run (default: 50)", NULL}, + "How many loops to run (default: 50)", NULL} + , {NULL} }; GError *err = NULL; diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c index 5ac6c4e..24fdb30 100644 --- a/tests/check/gst/gstpad.c +++ b/tests/check/gst/gstpad.c @@ -1858,7 +1858,7 @@ GST_START_TEST (test_pad_probe_block_add_remove) thread = g_thread_try_new ("gst-check", (GThreadFunc) push_buffer_async, pad, NULL); - /* wait for the block */ + /* wait for the block */ while (!gst_pad_is_blocking (pad)) g_thread_yield (); diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c index d5ffe44..032ffc0 100644 --- a/tests/check/gst/gsturi.c +++ b/tests/check/gst/gsturi.c @@ -983,10 +983,10 @@ GST_START_TEST (test_url_get_set) tmp_str = gst_uri_to_string (url); #if GLIB_CHECK_VERSION(2, 59, 0) fail_unless_equals_string (tmp_str, - "//example.com/path/to/file/there/segment?key=value&query#fragment"); + "//example.com/path/to/file/there/segment?key=value&query#fragment"); #else fail_unless_equals_string (tmp_str, - "//example.com/path/to/file/there/segment?query&key=value#fragment"); + "//example.com/path/to/file/there/segment?query&key=value#fragment"); #endif g_free (tmp_str); -- 2.7.4