luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use OwnNameData structure when owning a name instead of WatchNameData.

Browse Source 
The two structures share some common variable name but it's confusing.

Signed-off-by: Frederic Martinsons <frederic.martinsons@sigfox.com>
This commit is contained in:
Frederic Martinsons 2021-02-27 09:23:10 +01:00
parent 98abfc9da7
commit 2f5f69e969
1 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gio/tests/gdbus-names.c
View File

@ -514,7 +514,7 @@ w_name_acquired_handler (GDBusConnection *connection,
const gchar *name, const gchar *name,
gpointer user_data) gpointer user_data)
{ {
WatchNameData *data = user_data; OwnNameData *data = user_data;
data->num_acquired += 1; data->num_acquired += 1;
g_main_loop_quit (loop); g_main_loop_quit (loop);
} }
@ -524,7 +524,7 @@ w_name_lost_handler (GDBusConnection *connection,
const gchar *name, const gchar *name,
gpointer user_data) gpointer user_data)
{ {
WatchNameData *data = user_data; OwnNameData *data = user_data;
data->num_lost += 1; data->num_lost += 1;
g_main_loop_quit (loop); g_main_loop_quit (loop);
} }
@ -646,6 +646,7 @@ static void
test_bus_watch_name (gconstpointer d) test_bus_watch_name (gconstpointer d)
{ {
WatchNameData data; WatchNameData data;
OwnNameData own_data;
guint id; guint id;
guint owner_id; guint owner_id;
GDBusConnection *connection; GDBusConnection *connection;
@ -688,15 +689,16 @@ test_bus_watch_name (gconstpointer d)
g_assert_cmpint (data.num_appeared, ==, 0); g_assert_cmpint (data.num_appeared, ==, 0);
g_assert_cmpint (data.num_vanished, ==, 1); g_assert_cmpint (data.num_vanished, ==, 1);
g_assert_cmpint (data.num_free_func, ==, 1); g_assert_cmpint (data.num_free_func, ==, 1);
data.num_free_func = 0;
/* /*
* Now bring up a bus, own a name, and then start watching it. * Now bring up a bus, own a name, and then start watching it.
*/ */
session_bus_up (); session_bus_up ();
/* own the name */ /* own the name */
data.num_free_func = 0; own_data.num_free_func = 0;
data.num_acquired = 0; own_data.num_acquired = 0;
data.num_lost = 0; own_data.num_lost = 0;
data.expect_null_connection = FALSE; data.expect_null_connection = FALSE;
owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
name, name,
@ -704,11 +706,11 @@ test_bus_watch_name (gconstpointer d)
w_bus_acquired_handler, w_bus_acquired_handler,
w_name_acquired_handler, w_name_acquired_handler,
w_name_lost_handler, w_name_lost_handler,
&data, &own_data,
(GDestroyNotify) watch_name_data_free_func); (GDestroyNotify) own_name_data_free_func);
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert_cmpint (data.num_acquired, ==, 1); g_assert_cmpint (own_data.num_acquired, ==, 1);
g_assert_cmpint (data.num_lost, ==, 0); g_assert_cmpint (own_data.num_lost, ==, 0);
connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL); connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (connection != NULL); g_assert (connection != NULL);
@ -753,9 +755,9 @@ test_bus_watch_name (gconstpointer d)
/* unown the name */ /* unown the name */
g_bus_unown_name (owner_id); g_bus_unown_name (owner_id);
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert_cmpint (data.num_acquired, ==, 1); g_assert_cmpint (own_data.num_acquired, ==, 1);
g_assert_cmpint (data.num_free_func, ==, 2); g_assert_cmpint (own_data.num_free_func, ==, 1);
own_data.num_free_func = 0;
/* /*
* Create a watcher and then make a name be owned. * Create a watcher and then make a name be owned.
* *
@ -805,21 +807,21 @@ test_bus_watch_name (gconstpointer d)
if (!watch_name_test->existing_service) if (!watch_name_test->existing_service)
{ {
/* own the name */ /* own the name */
data.num_acquired = 0; own_data.num_acquired = 0;
data.num_lost = 0; own_data.num_lost = 0;
data.expect_null_connection = FALSE; own_data.expect_null_connection = FALSE;
owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
name, name,
G_BUS_NAME_OWNER_FLAGS_NONE, G_BUS_NAME_OWNER_FLAGS_NONE,
w_bus_acquired_handler, w_bus_acquired_handler,
w_name_acquired_handler, w_name_acquired_handler,
w_name_lost_handler, w_name_lost_handler,
&data, &own_data,
(GDestroyNotify) watch_name_data_free_func); (GDestroyNotify) own_name_data_free_func);
while (data.num_acquired == 0 || data.num_appeared == 0) while (own_data.num_acquired == 0 || data.num_appeared == 0)
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert_cmpint (data.num_acquired, ==, 1); g_assert_cmpint (own_data.num_acquired, ==, 1);
g_assert_cmpint (data.num_lost, ==, 0); g_assert_cmpint (own_data.num_lost, ==, 0);
g_assert_cmpint (data.num_appeared, ==, 1); g_assert_cmpint (data.num_appeared, ==, 1);
g_assert_cmpint (data.num_vanished, ==, 1); g_assert_cmpint (data.num_vanished, ==, 1);
} }
@ -838,12 +840,12 @@ test_bus_watch_name (gconstpointer d)
if (!watch_name_test->existing_service) if (!watch_name_test->existing_service)
{ {
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert_cmpint (data.num_lost, ==, 1); g_assert_cmpint (own_data.num_lost, ==, 1);
g_assert_cmpint (data.num_vanished, ==, 2); g_assert_cmpint (data.num_vanished, ==, 2);
} }
else else
{ {
g_assert_cmpint (data.num_lost, ==, 0); g_assert_cmpint (own_data.num_lost, ==, 0);
g_assert_cmpint (data.num_vanished, ==, 1); g_assert_cmpint (data.num_vanished, ==, 1);
} }
g_bus_unwatch_name (id); g_bus_unwatch_name (id);
@ -853,7 +855,7 @@ test_bus_watch_name (gconstpointer d)
{ {
g_bus_unown_name (owner_id); g_bus_unown_name (owner_id);
g_main_loop_run (loop); g_main_loop_run (loop);
g_assert_cmpint (data.num_free_func, ==, 2); g_assert_cmpint (own_data.num_free_func, ==, 1);
} }
session_bus_down (); session_bus_down ();
} }