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

gdbuserror: Drop unnecessary volatile qualifiers from variables

Browse Source 
This should introduce no API changes. The
`g_dbus_error_register_error_domain()` function still (incorrectly) has
a `volatile` argument, but dropping that qualifier 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:26:19 +00:00
parent 3361240439
commit 7c7623c4a3
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gio/gdbuserror.c
View File

@ -84,12 +84,12 @@
* GQuark * GQuark
* foo_bar_error_quark (void) * foo_bar_error_quark (void)
* { * {
* static volatile gsize quark_volatile = 0; * static gsize quark = 0;
* g_dbus_error_register_error_domain ("foo-bar-error-quark", * g_dbus_error_register_error_domain ("foo-bar-error-quark",
* &quark_volatile, * &quark,
* foo_bar_error_entries, * foo_bar_error_entries,
* G_N_ELEMENTS (foo_bar_error_entries)); * G_N_ELEMENTS (foo_bar_error_entries));
* return (GQuark) quark_volatile; * return (GQuark) quark;
* } * }
* ]| * ]|
* With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and * With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and
@ -160,12 +160,12 @@ GQuark
g_dbus_error_quark (void) g_dbus_error_quark (void)
{ {
G_STATIC_ASSERT (G_N_ELEMENTS (g_dbus_error_entries) - 1 == G_DBUS_ERROR_PROPERTY_READ_ONLY); G_STATIC_ASSERT (G_N_ELEMENTS (g_dbus_error_entries) - 1 == G_DBUS_ERROR_PROPERTY_READ_ONLY);
static volatile gsize quark_volatile = 0; static gsize quark = 0;
g_dbus_error_register_error_domain ("g-dbus-error-quark", g_dbus_error_register_error_domain ("g-dbus-error-quark",
&quark_volatile, &quark,
g_dbus_error_entries, g_dbus_error_entries,
G_N_ELEMENTS (g_dbus_error_entries)); G_N_ELEMENTS (g_dbus_error_entries));
return (GQuark) quark_volatile; return (GQuark) quark;
} }
/** /**
@ -185,25 +185,31 @@ g_dbus_error_register_error_domain (const gchar *error_domain_quark_na
const GDBusErrorEntry *entries, const GDBusErrorEntry *entries,
guint num_entries) guint num_entries)
{ {
gsize *quark;
g_return_if_fail (error_domain_quark_name != NULL); g_return_if_fail (error_domain_quark_name != NULL);
g_return_if_fail (quark_volatile != NULL); g_return_if_fail (quark_volatile != NULL);
g_return_if_fail (entries != NULL); g_return_if_fail (entries != NULL);
g_return_if_fail (num_entries > 0); g_return_if_fail (num_entries > 0);
if (g_once_init_enter (quark_volatile)) /* Drop the volatile qualifier, which should never have been on the argument
* in the first place. */
quark = (gsize *) quark_volatile;
if (g_once_init_enter (quark))
{ {
guint n; guint n;
GQuark quark; GQuark new_quark;
quark = g_quark_from_static_string (error_domain_quark_name); new_quark = g_quark_from_static_string (error_domain_quark_name);
for (n = 0; n < num_entries; n++) for (n = 0; n < num_entries; n++)
{ {
g_warn_if_fail (g_dbus_error_register_error (quark, g_warn_if_fail (g_dbus_error_register_error (new_quark,
entries[n].error_code, entries[n].error_code,
entries[n].dbus_error_name)); entries[n].dbus_error_name));
} }
g_once_init_leave (quark_volatile, quark); g_once_init_leave (quark, new_quark);
} }
} }