diff options
| author | Simon McVittie <smcv@debian.org> | 2021-09-26 16:41:30 +0100 |
|---|---|---|
| committer | Niels De Graef <nielsdegraef@gmail.com> | 2022-05-21 10:38:47 +0000 |
| commit | eada1440fec9a082d199ef83bb92b5af149d4c1f (patch) | |
| tree | df9dcf50cee50dc7a302c5f7308f20f189573e2e /pkcs11/gkm | |
| parent | 232010c1041b7bd6e7f4757b87e157a05a28425d (diff) | |
| download | gnome-keyring-eada1440fec9a082d199ef83bb92b5af149d4c1f.tar.gz | |
Stop using volatile in conjunction with atomic operationswip/smcv/fix-ci
As discussed in <https://gitlab.gnome.org/GNOME/glib/-/issues/600>,
the volatile qualifier rarely has the semantics that are desired in C/C++.
With recent gcc versions, combining pointers to volatile-qualified types
with the __atomic_foo() family of builtins causes compiler warnings.
http://c.isvolatileusefulwiththreads.com/ has some other useful
references.
Signed-off-by: Simon McVittie <smcv@debian.org>
Diffstat (limited to 'pkcs11/gkm')
| -rw-r--r-- | pkcs11/gkm/gkm-certificate.c | 2 | ||||
| -rw-r--r-- | pkcs11/gkm/gkm-data-der.c | 2 | ||||
| -rw-r--r-- | pkcs11/gkm/gkm-serializable.c | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkcs11/gkm/gkm-certificate.c b/pkcs11/gkm/gkm-certificate.c index 28ae0960..d434e527 100644 --- a/pkcs11/gkm/gkm-certificate.c +++ b/pkcs11/gkm/gkm-certificate.c @@ -74,7 +74,7 @@ G_DEFINE_TYPE_EXTENDED (GkmCertificate, gkm_certificate, GKM_TYPE_OBJECT, 0, static void init_quarks (void) { - static volatile gsize quarks_inited = 0; + static gsize quarks_inited = 0; if (g_once_init_enter (&quarks_inited)) { #define QUARK(name, value) \ diff --git a/pkcs11/gkm/gkm-data-der.c b/pkcs11/gkm/gkm-data-der.c index 68f41d49..e7528022 100644 --- a/pkcs11/gkm/gkm-data-der.c +++ b/pkcs11/gkm/gkm-data-der.c @@ -52,7 +52,7 @@ static GQuark OID_ANSI_SECP521R1; static void init_quarks (void) { - static volatile gsize quarks_inited = 0; + static gsize quarks_inited = 0; if (g_once_init_enter (&quarks_inited)) { diff --git a/pkcs11/gkm/gkm-serializable.c b/pkcs11/gkm/gkm-serializable.c index ef7be957..7ebec114 100644 --- a/pkcs11/gkm/gkm-serializable.c +++ b/pkcs11/gkm/gkm-serializable.c @@ -37,9 +37,9 @@ gkm_serializable_base_init (gpointer gobject_class) GType gkm_serializable_get_type (void) { - static volatile gsize type_id__volatile = 0; + static gsize type_inited = 0; - if (g_once_init_enter (&type_id__volatile)) { + if (g_once_init_enter (&type_inited)) { static const GTypeInfo info = { sizeof (GkmSerializableIface), gkm_serializable_base_init, /* base init */ @@ -55,10 +55,10 @@ gkm_serializable_get_type (void) GType type_id = g_type_register_static (G_TYPE_INTERFACE, "GkmSerializableIface", &info, 0); g_type_interface_add_prerequisite (type_id, G_TYPE_OBJECT); - g_once_init_leave (&type_id__volatile, type_id); + g_once_init_leave (&type_inited, type_id); } - return type_id__volatile; + return type_inited; } gboolean |