From 78f56671259308a22c9de146182b28a8e941a396 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 11 May 2016 08:08:42 +0200 Subject: [PATCH] Follow up of commit 5bd460ecf027bb36ffd21d325739bb51df94521f Bug: https://bugs.freedesktop.org/show_bug.cgi?id=95191 - remove unused variable enabled - reduce usage of _dbus_atomic_get() This patch will be merged into the related commit after review --- dbus/dbus-spawn-win.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c index 516cc9d..697d0cb 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -113,7 +113,6 @@ static DBusBabysitter* _dbus_babysitter_new (void) { DBusBabysitter *sitter; - static int enabled = -1; dbus_int32_t old_refcount; sitter = dbus_new0 (DBusBabysitter, 1); @@ -173,9 +172,9 @@ _dbus_babysitter_ref (DBusBabysitter *sitter) dbus_int32_t old_refcount; PING(); _dbus_assert (sitter != NULL); - _dbus_assert (_dbus_atomic_get (&sitter->refcount) > 0); old_refcount = _dbus_atomic_inc (&sitter->refcount); + _dbus_assert (old_refcount > 0); _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount+1, __FUNCTION__); return sitter; @@ -215,9 +214,9 @@ _dbus_babysitter_unref (DBusBabysitter *sitter) PING(); _dbus_assert (sitter != NULL); - _dbus_assert (_dbus_atomic_get (&sitter->refcount) > 0); old_refcount = _dbus_atomic_dec (&sitter->refcount); + _dbus_assert (old_refcount > 0); _dbus_babysitter_trace_ref (sitter, old_refcount, old_refcount-1, __FUNCTION__); if (old_refcount == 1) -- 1.8.4.5