Attachment 58165 Details for Bug 46358 – [03/10] cm test: free things in a less verbose way

[patch] [03/10] cm test: free things in a less verbose way

0003-cm-test-free-things-in-a-less-verbose-way.patch (text/plain), 3.17 KB, created by Simon McVittie on 2012-03-08 03:21:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-03-08 03:21:04 UTC

Size: 3.17 KB

patch

obsolete

>From 110a85c55229cae716d22a84cf55af12165f18a8 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 5 Mar 2012 19:48:46 +0000
>Subject: [PATCH 03/10] cm test: free things in a less verbose way
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46358
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> tests/dbus/cm.c |   16 +++-------------
> 1 files changed, 3 insertions(+), 13 deletions(-)
>
>diff --git a/tests/dbus/cm.c b/tests/dbus/cm.c
>index 596aab3..1648ce2 100644
>--- a/tests/dbus/cm.c
>+++ b/tests/dbus/cm.c
>@@ -123,10 +123,9 @@ static void
> teardown (Test *test,
>           gconstpointer data)
> {
>-  g_object_unref (test->service_cm);
>-  test->service_cm = NULL;
>-  g_object_unref (test->dbus);
>-  test->dbus = NULL;
>+  g_clear_object (&test->service_cm);
>+  g_clear_object (&test->dbus);
>+  g_clear_object (&test->cm);
>   g_main_loop_unref (test->mainloop);
>   test->mainloop = NULL;
> }
>@@ -174,7 +173,6 @@ test_nothing_got_info (Test *test,
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (error);
>-  g_test_queue_unref (test->cm);
> 
>   /* Spin the mainloop until we get the got-info signal. This API is rubbish,
>    * but it's better than it used to be... */
>@@ -220,7 +218,6 @@ test_file_got_info (Test *test,
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (error);
>-  g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18207");
>   id = g_signal_connect (test->cm, "got-info",
>@@ -361,7 +358,6 @@ test_complex_file_got_info (Test *test,
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (error);
>-  g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18207");
>   id = g_signal_connect (test->cm, "got-info",
>@@ -716,7 +712,6 @@ test_dbus_got_info (Test *test,
>       NULL, &error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (error);
>-  g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18207");
>   id = g_signal_connect (test->cm, "got-info",
>@@ -752,7 +747,6 @@ test_nothing_ready (Test *test,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (test->error);
>-  g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18291");
> 
>@@ -804,7 +798,6 @@ test_file_ready (Test *test,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (test->error);
>-  g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18291");
> 
>@@ -853,7 +846,6 @@ test_complex_file_ready (Test *test,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (test->error);
>-  g_test_queue_unref (test->cm);
> 
>   g_test_bug ("18291");
> 
>@@ -909,7 +901,6 @@ test_dbus_ready (Test *test,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (test->error);
>-  g_test_queue_unref (test->cm);
> 
>   if (flags & ACTIVATE_CM)
>     {
>@@ -988,7 +979,6 @@ test_dbus_fallback (Test *test,
>       NULL, &test->error);
>   g_assert (TP_IS_CONNECTION_MANAGER (test->cm));
>   g_assert_no_error (test->error);
>-  g_test_queue_unref (test->cm);
> 
>   if (flags & ACTIVATE_CM)
>     {
>-- 
>1.7.9.1
>

Actions: View | Splinter Review

Attachments on bug 46358: 58163 | 58164 | 58165 | 58166 | 58167 | 58168 | 58169 | 58170 | 58171 | 58172

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.