luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 21:33:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

gdbus: simplify error handling in g_dbus_connection_send_message_unlocked()

Browse Source 
"goto out" is a fine pattern, especially when we are not using
cleanup attribute macros.

But in this case it was unnecessary.
This commit is contained in:
Thomas Haller 2021-03-28 09:08:27 +02:00
parent 60d4092a2c
commit 090eeabe9c
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gio/gdbusconnection.c
View File

@ -1610,7 +1610,6 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
guchar *blob; guchar *blob;
gsize blob_size; gsize blob_size;
guint32 serial_to_use; guint32 serial_to_use;
gboolean ret;
CONNECTION_ENSURE_LOCK (connection); CONNECTION_ENSURE_LOCK (connection);
@ -1619,9 +1618,6 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
/* TODO: check all necessary headers are present */ /* TODO: check all necessary headers are present */
ret = FALSE;
blob = NULL;
if (out_serial != NULL) if (out_serial != NULL)
*out_serial = 0; *out_serial = 0;
@ -1633,14 +1629,14 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
if (!check_unclosed (connection, if (!check_unclosed (connection,
(flags & SEND_MESSAGE_FLAGS_INITIALIZING) ? MAY_BE_UNINITIALIZED : 0, (flags & SEND_MESSAGE_FLAGS_INITIALIZING) ? MAY_BE_UNINITIALIZED : 0,
error)) error))
goto out; return FALSE;
blob = g_dbus_message_to_blob (message, blob = g_dbus_message_to_blob (message,
&blob_size, &blob_size,
connection->capabilities, connection->capabilities,
error); error);
if (blob == NULL) if (blob == NULL)
goto out; return FALSE;
if (flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL) if (flags & G_DBUS_SEND_MESSAGE_FLAGS_PRESERVE_SERIAL)
serial_to_use = g_dbus_message_get_serial (message); serial_to_use = g_dbus_message_get_serial (message);
@ -1686,18 +1682,13 @@ g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
g_dbus_message_set_serial (message, serial_to_use); g_dbus_message_set_serial (message, serial_to_use);
g_dbus_message_lock (message); g_dbus_message_lock (message);
_g_dbus_worker_send_message (connection->worker, _g_dbus_worker_send_message (connection->worker,
message, message,
(gchar*) blob, (gchar*) blob, /* transfer ownership */
blob_size); blob_size);
blob = NULL; /* since _g_dbus_worker_send_message() steals the blob */
ret = TRUE; return TRUE;
out:
g_free (blob);
return ret;
} }
/** /**