luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-23 15:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

gsocketlistener: Minor cleanups to use g_clear_object() and friends

Browse Source 
This should introduce no functional changes.

Signed-off-by: Philip Withnall <pwithnall@gnome.org>
This commit is contained in:
Philip Withnall 2025-02-07 14:45:27 +00:00
parent 05e529f3f8
commit 007c525d61
No known key found for this signature in database
GPG Key ID: C5C42CFB268637CA
1 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gio/gsocketlistener.c
View File

@ -549,10 +549,9 @@ g_socket_listener_add_inet_port (GSocketListener *listener,
if (!g_socket_bind (socket4, address, TRUE, error))
{
g_object_unref (address);
g_object_unref (socket4);
if (socket6 != NULL)
g_object_unref (socket6);
g_clear_object (&address);
g_clear_object (&socket4);
g_clear_object (&socket6);
g_clear_error (&socket6_listen_error);
return FALSE;
@ -1137,8 +1136,7 @@ g_socket_listener_add_any_inet_port (GSocketListener *listener,
if (!result ||
!(address = g_socket_get_local_address (socket6, error)))
{
g_object_unref (socket6);
socket6 = NULL;
g_clear_object (&socket6);
break;
}
@ -1210,14 +1208,12 @@ g_socket_listener_add_any_inet_port (GSocketListener *listener,
else
/* we failed to bind to the specified port. try again. */
{
g_object_unref (socket4);
socket4 = NULL;
g_clear_object (&socket4);
/* keep this open so we get a different port number */
sockets_to_close = g_slist_prepend (sockets_to_close,
socket6);
g_steal_pointer (&socket6));
candidate_port = 0;
socket6 = NULL;
}
}
else
@ -1231,8 +1227,7 @@ g_socket_listener_add_any_inet_port (GSocketListener *listener,
if (!result ||
!(address = g_socket_get_local_address (socket4, error)))
{
g_object_unref (socket4);
socket4 = NULL;
g_clear_object (&socket4);
break;
}
@ -1251,12 +1246,7 @@ g_socket_listener_add_any_inet_port (GSocketListener *listener,
/* should only be non-zero if we have a socket */
g_assert ((candidate_port != 0) == (socket4 || socket6));
while (sockets_to_close)
{
g_object_unref (sockets_to_close->data);
sockets_to_close = g_slist_delete_link (sockets_to_close,
sockets_to_close);
}
g_slist_free_full (g_steal_pointer (&sockets_to_close), g_object_unref);
/* now we actually listen() the sockets and add them to the listener. If
* either of the listen()s fails, only return the other socket. Fail if both