luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-25 19:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

gdbusconnection: Drop unnecessary volatile qualifiers from variables

Browse Source 
This should introduce no API changes; there are public functions
exported by `GDBusConnection` which still have some (incorrectly)
`volatile` arguments, but dropping those qualifiers would be an API
break.

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

Helps: #600
This commit is contained in:
Philip Withnall 2020-11-11 18:24:28 +00:00
parent f4607def16
commit 3361240439
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gio/gdbusconnection.c
View File

@ -393,7 +393,7 @@ struct _GDBusConnection
* FLAG_CLOSED is the closed property. It may be read at any time, but * FLAG_CLOSED is the closed property. It may be read at any time, but
* may only be written while holding @lock. * may only be written while holding @lock.
*/ */
volatile gint atomic_flags; gint atomic_flags; /* (atomic) */
/* If the connection could not be established during initable_init(), /* If the connection could not be established during initable_init(),
* this GError will be set. * this GError will be set.
@ -1596,7 +1596,7 @@ static gboolean
g_dbus_connection_send_message_unlocked (GDBusConnection *connection, g_dbus_connection_send_message_unlocked (GDBusConnection *connection,
GDBusMessage *message, GDBusMessage *message,
GDBusSendMessageFlags flags, GDBusSendMessageFlags flags,
volatile guint32 *out_serial, guint32 *out_serial,
GError **error) GError **error)
{ {
guchar *blob; guchar *blob;
@ -1741,7 +1741,7 @@ g_dbus_connection_send_message (GDBusConnection *connection,
g_return_val_if_fail (error == NULL || *error == NULL, FALSE); g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
CONNECTION_LOCK (connection); CONNECTION_LOCK (connection);
ret = g_dbus_connection_send_message_unlocked (connection, message, flags, out_serial, error); ret = g_dbus_connection_send_message_unlocked (connection, message, flags, (guint32 *) out_serial, error);
CONNECTION_UNLOCK (connection); CONNECTION_UNLOCK (connection);
return ret; return ret;
} }
@ -1901,7 +1901,7 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect
GDBusMessage *message, GDBusMessage *message,
GDBusSendMessageFlags flags, GDBusSendMessageFlags flags,
gint timeout_msec, gint timeout_msec,
volatile guint32 *out_serial, guint32 *out_serial,
GCancellable *cancellable, GCancellable *cancellable,
GAsyncReadyCallback callback, GAsyncReadyCallback callback,
gpointer user_data) gpointer user_data)
@ -1909,7 +1909,7 @@ g_dbus_connection_send_message_with_reply_unlocked (GDBusConnection *connect
GTask *task; GTask *task;
SendMessageData *data; SendMessageData *data;
GError *error = NULL; GError *error = NULL;
volatile guint32 serial; guint32 serial;
if (out_serial == NULL) if (out_serial == NULL)
out_serial = &serial; out_serial = &serial;
@ -2022,7 +2022,7 @@ g_dbus_connection_send_message_with_reply (GDBusConnection *connection,
message, message,
flags, flags,
timeout_msec, timeout_msec,
out_serial, (guint32 *) out_serial,
cancellable, cancellable,
callback, callback,
user_data); user_data);
@ -3082,7 +3082,7 @@ g_dbus_connection_get_peer_credentials (GDBusConnection *connection)
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
static volatile guint _global_filter_id = 1; static guint _global_filter_id = 1; /* (atomic) */
/** /**
* g_dbus_connection_add_filter: * g_dbus_connection_add_filter:
@ -3327,9 +3327,9 @@ args_to_rule (const gchar *sender,
return g_string_free (rule, FALSE); return g_string_free (rule, FALSE);
} }
static volatile guint _global_subscriber_id = 1; static guint _global_subscriber_id = 1; /* (atomic) */
static volatile guint _global_registration_id = 1; static guint _global_registration_id = 1; /* (atomic) */
static volatile guint _global_subtree_registration_id = 1; static guint _global_subtree_registration_id = 1; /* (atomic) */
/* ---------------------------------------------------------------------------------------------------- */ /* ---------------------------------------------------------------------------------------------------- */
@ -5992,7 +5992,7 @@ g_dbus_connection_call_sync_internal (GDBusConnection *connection,
message, message,
send_flags, send_flags,
timeout_msec, timeout_msec,
NULL, /* volatile guint32 *out_serial */ NULL, /* guint32 *out_serial */
cancellable, cancellable,
&local_error); &local_error);