diff options
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/dbus/gkd-secret-dispatch.c | 2 | ||||
| -rw-r--r-- | daemon/dbus/gkd-secret-error.c | 12 | ||||
| -rw-r--r-- | daemon/ssh-agent/test-gkd-ssh-agent-service.c | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/daemon/dbus/gkd-secret-dispatch.c b/daemon/dbus/gkd-secret-dispatch.c index fed4c13e..a33106c2 100644 --- a/daemon/dbus/gkd-secret-dispatch.c +++ b/daemon/dbus/gkd-secret-dispatch.c @@ -25,7 +25,7 @@ static void gkd_secret_dispatch_base_init (gpointer gobject_class) { - static volatile gsize initialized = 0; + static gsize initialized = 0; if (g_once_init_enter (&initialized)) { g_once_init_leave (&initialized, 1); } diff --git a/daemon/dbus/gkd-secret-error.c b/daemon/dbus/gkd-secret-error.c index f9012c30..ab0b20bc 100644 --- a/daemon/dbus/gkd-secret-error.c +++ b/daemon/dbus/gkd-secret-error.c @@ -38,13 +38,13 @@ static const GDBusErrorEntry gkd_secret_error_entries[] = { GQuark gkd_secret_error_quark (void) { - static volatile gsize quark_volatile = 0; + static gsize quark = 0; g_dbus_error_register_error_domain ("gkd_secret_error", - &quark_volatile, + &quark, gkd_secret_error_entries, G_N_ELEMENTS (gkd_secret_error_entries)); - return quark_volatile; + return quark; } static const GDBusErrorEntry gkd_secret_daemon_error_entries[] = { @@ -54,13 +54,13 @@ static const GDBusErrorEntry gkd_secret_daemon_error_entries[] = { GQuark gkd_secret_daemon_error_quark (void) { - static volatile gsize quark_volatile = 0; + static gsize quark = 0; g_dbus_error_register_error_domain ("gkd_secret_daemon_error", - &quark_volatile, + &quark, gkd_secret_daemon_error_entries, G_N_ELEMENTS (gkd_secret_daemon_error_entries)); - return quark_volatile; + return quark; } void diff --git a/daemon/ssh-agent/test-gkd-ssh-agent-service.c b/daemon/ssh-agent/test-gkd-ssh-agent-service.c index 5c7a6179..970cdfde 100644 --- a/daemon/ssh-agent/test-gkd-ssh-agent-service.c +++ b/daemon/ssh-agent/test-gkd-ssh-agent-service.c @@ -39,7 +39,7 @@ typedef struct { EggBuffer resp; GkdSshAgentService *service; GMainContext *server_thread_context; - volatile gint server_thread_stop; + gint server_thread_stop; /* (atomic) */ GSocketConnection *connection; GThread *thread; GMutex lock; |