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

gsocketclient: Document ownership of connection_attempts better

Browse Source 
This introduces no functional changes; just made it while trying to
debug issue #2925.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>

Helps: #2925
This commit is contained in:
Philip Withnall
2023-02-22 16:34:05 +00:00
parent 5a69cc22dc
commit 81a42f4c59
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gsocketclient.c
View File

@@ -1469,7 +1469,7 @@ typedef struct
GCancellable *enumeration_parent_cancellable; /* (nullable) (owned) */ GCancellable *enumeration_parent_cancellable; /* (nullable) (owned) */
gulong enumeration_cancelled_id; gulong enumeration_cancelled_id;
GSList *connection_attempts; GSList *connection_attempts; /* (element-type ConnectionAttempt) (owned) */
GSList *successful_connections; GSList *successful_connections;
SocketClientErrorInfo *error_info; SocketClientErrorInfo *error_info;
@@ -1874,7 +1874,7 @@ g_socket_client_connected_callback (GObject *source,
GAsyncResult *result, GAsyncResult *result,
gpointer user_data) gpointer user_data)
{ {
ConnectionAttempt *attempt = user_data; ConnectionAttempt *attempt = g_steal_pointer (&user_data);
GSocketClientAsyncConnectData *data = attempt->data; GSocketClientAsyncConnectData *data = attempt->data;
if (task_completed_or_cancelled (data) || g_cancellable_is_cancelled (attempt->cancellable)) if (task_completed_or_cancelled (data) || g_cancellable_is_cancelled (attempt->cancellable))
@@ -2032,7 +2032,7 @@ g_socket_client_enumerator_callback (GObject *object,
g_source_set_callback (attempt->timeout_source, on_connection_attempt_timeout, attempt, NULL); g_source_set_callback (attempt->timeout_source, on_connection_attempt_timeout, attempt, NULL);
g_source_attach (attempt->timeout_source, g_task_get_context (data->task)); g_source_attach (attempt->timeout_source, g_task_get_context (data->task));
data->connection_attempts = g_slist_append (data->connection_attempts, attempt); data->connection_attempts = g_slist_append (data->connection_attempts, connection_attempt_ref (attempt));
if (g_task_get_cancellable (data->task)) if (g_task_get_cancellable (data->task))
{ {
@@ -2048,7 +2048,7 @@ g_socket_client_enumerator_callback (GObject *object,
g_socket_connection_connect_async (G_SOCKET_CONNECTION (attempt->connection), g_socket_connection_connect_async (G_SOCKET_CONNECTION (attempt->connection),
address, address,
attempt->cancellable, attempt->cancellable,
g_socket_client_connected_callback, connection_attempt_ref (attempt)); g_socket_client_connected_callback, attempt /* transfer full */);
} }
/** /**