From 6bd2bcb8f238d0df02a652684e152b4bc0329f43 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 21 Jun 2018 17:49:44 +0100 Subject: [PATCH 21/44] fixup! containers test: Maintain an array of confined connections Remove duplicate set of confined_unique_names[0]. Use gsize to index the array. --- test/containers.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/test/containers.c b/test/containers.c index 611a0dc6..001f4fce 100644 --- a/test/containers.c +++ b/test/containers.c @@ -199,7 +199,7 @@ fixture_disconnect_observer (Fixture *f) #ifdef HAVE_CONTAINERS_TEST static void fixture_connect_confined (Fixture *f, - guint i) + gsize i) { GError *error = NULL; @@ -221,7 +221,7 @@ fixture_connect_confined (Fixture *f, static void fixture_disconnect_confined (Fixture *f, - guint i) + gsize i) { if (f->confined_conns[i] != NULL) { @@ -546,8 +546,6 @@ test_basic (Fixture *f, g_assert_null (tuple); g_test_message ("Inspecting connection container info"); - f->confined_unique_names[0] = g_strdup ( - g_dbus_connection_get_unique_name (f->confined_conns[0])); tuple = g_dbus_proxy_call_sync (f->proxy, "GetConnectionInstance", g_variant_new ("(s)", f->confined_unique_names[0]), @@ -1625,7 +1623,7 @@ static void teardown (Fixture *f, gconstpointer context G_GNUC_UNUSED) { - guint i; + gsize i; g_clear_object (&f->proxy); -- 2.18.0.rc2