From 02bc7a19cbbaab7a8fdec17db601a61394b9520b Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Mon, 17 Oct 2011 17:43:01 +0300 Subject: [PATCH] Simplify property variable usage in btd_adapter_stop --- src/adapter.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index 47cd39ee8..d1ef17cff 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -2367,7 +2367,7 @@ static void set_mode_complete(struct btd_adapter *adapter) int btd_adapter_stop(struct btd_adapter *adapter) { - gboolean powered, discoverable, pairable, discovering; + gboolean prop_false = FALSE; /* cancel pending timeout */ if (adapter->discov_timeout_id) { @@ -2390,30 +2390,23 @@ int btd_adapter_stop(struct btd_adapter *adapter) adapter_remove_connection(adapter, device); } - if (adapter->scan_mode == (SCAN_PAGE | SCAN_INQUIRY)) { - discoverable = FALSE; + if (adapter->scan_mode == (SCAN_PAGE | SCAN_INQUIRY)) emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, "Discoverable", - DBUS_TYPE_BOOLEAN, &discoverable); - } + DBUS_TYPE_BOOLEAN, &prop_false); - if ((adapter->scan_mode & SCAN_PAGE) && adapter->pairable == TRUE) { - pairable = FALSE; + if ((adapter->scan_mode & SCAN_PAGE) && adapter->pairable == TRUE) emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, "Pairable", - DBUS_TYPE_BOOLEAN, &pairable); - } + DBUS_TYPE_BOOLEAN, &prop_false); - if (adapter->state != STATE_IDLE) { - discovering = FALSE; + if (adapter->state != STATE_IDLE) emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, "Discovering", - DBUS_TYPE_BOOLEAN, &discovering); - } + DBUS_TYPE_BOOLEAN, &prop_false); - powered = FALSE; emit_property_changed(connection, adapter->path, ADAPTER_INTERFACE, - "Powered", DBUS_TYPE_BOOLEAN, &powered); + "Powered", DBUS_TYPE_BOOLEAN, &prop_false); adapter->up = FALSE; adapter->scan_mode = SCAN_DISABLED; -- 2.47.3