diff options
Diffstat (limited to 'pkcs11')
| -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 | ||||
| -rw-r--r-- | pkcs11/secret-store/gkm-secret-fields.c | 2 | ||||
| -rw-r--r-- | pkcs11/xdg-store/gkm-xdg-trust.c | 2 |
5 files changed, 8 insertions, 8 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 diff --git a/pkcs11/secret-store/gkm-secret-fields.c b/pkcs11/secret-store/gkm-secret-fields.c index 7e4559c6..71620499 100644 --- a/pkcs11/secret-store/gkm-secret-fields.c +++ b/pkcs11/secret-store/gkm-secret-fields.c @@ -124,7 +124,7 @@ compat_hash_value_as_string (const gchar *value) GType gkm_secret_fields_boxed_type (void) { - static volatile gsize type_inited = 0; + static gsize type_inited = 0; static GType type = 0; if (g_once_init_enter (&type_inited)) { diff --git a/pkcs11/xdg-store/gkm-xdg-trust.c b/pkcs11/xdg-store/gkm-xdg-trust.c index 518e3151..a18d6ebe 100644 --- a/pkcs11/xdg-store/gkm-xdg-trust.c +++ b/pkcs11/xdg-store/gkm-xdg-trust.c @@ -78,7 +78,7 @@ static GQuark TRUST_TRUSTED_ANCHOR; static void init_quarks (void) { - static volatile gsize quarks_inited = 0; + static gsize quarks_inited = 0; if (g_once_init_enter (&quarks_inited)) { |