luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Clear up freeing of test data in socket test

Browse Source 
The same struct was reused across multiple tests, but without a shared
way of freeing its members. Refactor to add one.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall 2023-12-11 18:54:00 +00:00
parent 7cb953dab8
commit 309f5384ca
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
gio/tests/socket.c
View File

@ -43,14 +43,25 @@
static gboolean ipv6_supported; static gboolean ipv6_supported;
typedef struct { typedef struct {
GSocket *server; GSocket *server; /* (owned) (not nullable) */
GSocket *client; GSocket *client; /* (owned) (nullable) */
GSocketFamily family; GSocketFamily family;
GThread *thread; GThread *thread; /* (owned) (not nullable) */
GMainLoop *loop; GMainLoop *loop; /* (owned) (nullable) */
GCancellable *cancellable; /* to shut down dgram echo server thread */ GCancellable *cancellable; /* to shut down dgram echo server thread; (owned) (nullable) */
} IPTestData; } IPTestData;
static void
ip_test_data_free (IPTestData *data)
{
g_clear_object (&data->server);
g_clear_object (&data->client);
g_clear_pointer (&data->loop, g_main_loop_unref);
g_clear_object (&data->cancellable);
g_slice_free (IPTestData, data);
}
static gpointer static gpointer
echo_server_dgram_thread (gpointer user_data) echo_server_dgram_thread (gpointer user_data)
{ {
@ -130,7 +141,7 @@ create_server_full (GSocketFamily family,
GSocketAddress *addr; GSocketAddress *addr;
GInetAddress *iaddr; GInetAddress *iaddr;
data = g_slice_new (IPTestData); data = g_slice_new0 (IPTestData);
data->family = family; data->family = family;
data->server = server = g_socket_new (family, data->server = server = g_socket_new (family,
@ -198,8 +209,7 @@ create_server_full (GSocketFamily family,
return data; return data;
error: error:
g_clear_object (&data->server); ip_test_data_free (data);
g_slice_free (IPTestData, data);
return NULL; return NULL;
} }
@ -396,7 +406,7 @@ test_ip_async (GSocketFamily family)
data->loop = g_main_loop_new (NULL, TRUE); data->loop = g_main_loop_new (NULL, TRUE);
g_main_loop_run (data->loop); g_main_loop_run (data->loop);
g_main_loop_unref (data->loop); g_clear_pointer (&data->loop, g_main_loop_unref);
g_socket_shutdown (client, FALSE, TRUE, &error); g_socket_shutdown (client, FALSE, TRUE, &error);
g_assert_no_error (error); g_assert_no_error (error);
@ -426,10 +436,7 @@ test_ip_async (GSocketFamily family)
g_socket_close (data->server, &error); g_socket_close (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (data->server); ip_test_data_free (data);
g_object_unref (client);
g_slice_free (IPTestData, data);
} }
static void static void
@ -567,10 +574,9 @@ test_ip_sync (GSocketFamily family)
g_socket_close (data->server, &error); g_socket_close (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (data->server);
g_object_unref (client); g_object_unref (client);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
static void static void
@ -801,12 +807,10 @@ test_ip_sync_dgram (GSocketFamily family)
g_socket_close (data->server, &error); g_socket_close (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (data->server);
g_object_unref (data->cancellable);
g_object_unref (client); g_object_unref (client);
g_object_unref (dest_addr); g_object_unref (dest_addr);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
static void static void
@ -1046,10 +1050,9 @@ test_close_graceful (void)
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (server); g_object_unref (server);
g_object_unref (data->server);
g_object_unref (client); g_object_unref (client);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
#if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY) #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
@ -1132,11 +1135,10 @@ test_ipv6_v4mapped (void)
g_socket_close (data->server, &error); g_socket_close (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (data->server);
g_object_unref (client); g_object_unref (client);
g_object_unref (v4addr); g_object_unref (v4addr);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
#endif #endif
@ -1198,10 +1200,9 @@ test_timed_wait (void)
g_socket_close (data->server, &error); g_socket_close (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (data->server);
g_object_unref (client); g_object_unref (client);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
static int static int
@ -1310,11 +1311,10 @@ test_fd_reuse (void)
g_assert_cmpint (g_socket_get_fd (client2), ==, -1); g_assert_cmpint (g_socket_get_fd (client2), ==, -1);
g_assert_cmpint (g_socket_get_fd (data->server), ==, -1); g_assert_cmpint (g_socket_get_fd (data->server), ==, -1);
g_object_unref (data->server);
g_object_unref (client); g_object_unref (client);
g_object_unref (client2); g_object_unref (client2);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
static void static void
@ -2071,10 +2071,9 @@ test_credentials_tcp_client (void)
g_socket_close (data->server, &error); g_socket_close (data->server, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_object_unref (data->server);
g_object_unref (client); g_object_unref (client);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
static void static void
@ -2144,10 +2143,8 @@ beach:
g_clear_object (&iaddr); g_clear_object (&iaddr);
g_clear_pointer (&data->thread, g_thread_join); g_clear_pointer (&data->thread, g_thread_join);
g_clear_object (&data->server);
g_clear_object (&data->client);
g_slice_free (IPTestData, data); ip_test_data_free (data);
} }
} }