[gvfs/wip/oholy/google-shared-drives-support] Drop use of volatile qualifier



commit 22b202120f2a41aa2d8d9a094f2410055f761e3d
Author: Ondrej Holy <oholy redhat com>
Date:   Fri Feb 12 14:02:31 2021 +0100

    Drop use of volatile qualifier
    
    GVfs build with --werror fails currently because of glib!1719. Let's
    drop the volatile qualifier as it doesn't help with atomicity anyway.
    
    Relates: https://gitlab.gnome.org/GNOME/glib/-/issues/600

 daemon/gvfsjobsource.c                     | 2 +-
 metadata/metatree.c                        | 2 +-
 monitor/goa/goavolumemonitor.c             | 2 +-
 monitor/udisks2/gvfsudisks2volumemonitor.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/daemon/gvfsjobsource.c b/daemon/gvfsjobsource.c
index 6d65270a..6d6c886e 100644
--- a/daemon/gvfsjobsource.c
+++ b/daemon/gvfsjobsource.c
@@ -36,7 +36,7 @@ static guint signals[LAST_SIGNAL] = { 0 };
 GType
 g_vfs_job_source_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
diff --git a/metadata/metatree.c b/metadata/metatree.c
index 0c11ddca..8412455e 100644
--- a/metadata/metatree.c
+++ b/metadata/metatree.c
@@ -170,7 +170,7 @@ GVfsMetadata *
 meta_tree_get_metadata_proxy ()
 {
   static GVfsMetadata *proxy = NULL;
-  static volatile gsize initialized = 0;
+  static gsize initialized = 0;
 
   if (g_once_init_enter (&initialized))
     {
diff --git a/monitor/goa/goavolumemonitor.c b/monitor/goa/goavolumemonitor.c
index 256e9398..46855c84 100644
--- a/monitor/goa/goavolumemonitor.c
+++ b/monitor/goa/goavolumemonitor.c
@@ -326,7 +326,7 @@ get_goa_client_sync (GError **error)
 {
   static GoaClient *client = NULL;
   static GError *_error = NULL;
-  static volatile gsize initialized = 0;
+  static gsize initialized = 0;
 
   if (g_once_init_enter (&initialized))
     {
diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c
index 4ecabd99..4d4f234a 100644
--- a/monitor/udisks2/gvfsudisks2volumemonitor.c
+++ b/monitor/udisks2/gvfsudisks2volumemonitor.c
@@ -437,7 +437,7 @@ get_udisks_client_sync (GError **error)
 {
   static UDisksClient *_client = NULL;
   static GError *_error = NULL;
-  static volatile gsize initialized = 0;
+  static gsize initialized = 0;
 
   if (g_once_init_enter (&initialized))
     {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]