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 /egg | |
| 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 'egg')
| -rw-r--r-- | egg/egg-libgcrypt.c | 2 | ||||
| -rw-r--r-- | egg/egg-oid.c | 2 | ||||
| -rw-r--r-- | egg/egg-symkey.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/egg/egg-libgcrypt.c b/egg/egg-libgcrypt.c index 61fe115f..da2fd353 100644 --- a/egg/egg-libgcrypt.c +++ b/egg/egg-libgcrypt.c @@ -62,7 +62,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL; void egg_libgcrypt_initialize (void) { - static volatile gsize gcrypt_initialized = 0; + static gsize gcrypt_initialized = 0; unsigned seed; if (g_once_init_enter (&gcrypt_initialized)) { diff --git a/egg/egg-oid.c b/egg/egg-oid.c index 96baea6d..fb3e3e06 100644 --- a/egg/egg-oid.c +++ b/egg/egg-oid.c @@ -115,7 +115,7 @@ static OidInfo oid_info[] = { static OidInfo* find_oid_info (GQuark oid) { - static volatile gsize inited_oids = 0; + static gsize inited_oids = 0; int i; g_return_val_if_fail (oid != 0, NULL); diff --git a/egg/egg-symkey.c b/egg/egg-symkey.c index 0f7a939f..80d4e66c 100644 --- a/egg/egg-symkey.c +++ b/egg/egg-symkey.c @@ -57,7 +57,7 @@ static GQuark OID_SHA1; static void init_quarks (void) { - static volatile gsize quarks_inited = 0; + static gsize quarks_inited = 0; if (g_once_init_enter (&quarks_inited)) { |