From 28f15d8b219877ac2dca771e823188d018db2db0 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Fri, 23 Aug 2013 17:19:51 +0800 Subject: [PATCH] Fix debug output about dbus server ref count dbus_server_disconnect() invokes dbus_server_unref() at the end of function, the latter will print a trace about server ref count decrease 1. However, it doesn't invoke dbus_server_ref(), so there isn't a trace about server ref count increase in debug output. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68303 Reviewed-by: Simon McVittie --- dbus/dbus-server.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index 2c2b949..19d8590 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -780,16 +780,7 @@ dbus_server_disconnect (DBusServer *server) { _dbus_return_if_fail (server != NULL); -#ifdef DBUS_DISABLE_CHECKS - _dbus_atomic_inc (&server->refcount); -#else - { - dbus_int32_t old_refcount = _dbus_atomic_inc (&server->refcount); - - _dbus_return_if_fail (old_refcount > 0); - } -#endif - + dbus_server_ref (server); SERVER_LOCK (server); _dbus_assert (server->vtable->disconnect != NULL); -- 2.7.4