resolved the code rule warnings

[platform/core/connectivity/bluetooth-frwk.git] / bt-oal / bluez_hal / src / bt-hal-adapter-dbus-handler.c

diff --git a/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c b/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c
index fff0e1c..d3fdb56 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c
+++ b/bt-oal/bluez_hal/src/bt-hal-adapter-dbus-handler.c
@@ -105,7 +105,7 @@ static gboolean __bt_hal_send_adapter_event(gpointer user_data)
        struct hal_ev_adapter_state_changed ev;
        gboolean *enable = (gboolean *)user_data;
 
-       if(*enable == TRUE)
+       if (*enable == TRUE)
                ev.state = HAL_POWER_ON;
        else
                ev.state = HAL_POWER_OFF;
@@ -113,9 +113,9 @@ static gboolean __bt_hal_send_adapter_event(gpointer user_data)
        if (!event_cb)
                event_cb = _bt_get_adapter_event_cb();
 
-       if (event_cb) {
+       if (event_cb)
                event_cb(HAL_EV_ADAPTER_STATE_CHANGED, &ev, sizeof(ev));
-       }
+
        g_free(enable);
        return false;
 }
@@ -125,7 +125,7 @@ static gboolean __bt_hal_send_le_event(gpointer user_data)
        struct hal_ev_le_state_changed ev;
        gboolean *enable = (gboolean *)user_data;
 
-       if(*enable == TRUE)
+       if (*enable == TRUE)
                ev.state = HAL_POWER_ON;
        else
                ev.state = HAL_POWER_OFF;
@@ -133,9 +133,9 @@ static gboolean __bt_hal_send_le_event(gpointer user_data)
        if (!event_cb)
                event_cb = _bt_get_adapter_event_cb();
 
-       if (event_cb) {
+       if (event_cb)
                event_cb(HAL_EV_LE_STATE_CHANGED, &ev, sizeof(ev));
-       }
+
        g_free(enable);
        return false;
 
@@ -151,16 +151,14 @@ int _bt_hal_dbus_enable_adapter(void)
        DBG("+");
 
        int le_value = VCONFKEY_BT_LE_STATUS_OFF;
-       if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &le_value)) {
+       if (vconf_get_int(VCONFKEY_BT_LE_STATUS, &le_value))
                ERR("fail to get vconf key!");
-       }
 
-       if(_bt_hal_get_adapter_powered_state(&powered) == BT_STATUS_FAIL) {
+       if (_bt_hal_get_adapter_powered_state(&powered) == BT_STATUS_FAIL)
                ERR("_bt_hal_get_adapter_powered_state failed");
-       }
 
        /*if LE is enabled and bluez is UP , send event from here and return.*/
-       if((le_value == VCONFKEY_BT_LE_STATUS_ON)&&(powered == 1)) {
+       if ((le_value == VCONFKEY_BT_LE_STATUS_ON) && (powered == 1)) {
                gboolean *user_data = g_new0(int, 1);
                *user_data = TRUE;
                g_idle_add(__bt_hal_send_adapter_event, (gpointer)user_data);
@@ -254,15 +252,13 @@ int _bt_hal_dbus_enable_le(void)
 
        DBG("+");
 
-       if (vconf_get_int(VCONFKEY_BT_STATUS, &adapter_value) != 0) {
+       if (vconf_get_int(VCONFKEY_BT_STATUS, &adapter_value) != 0)
                ERR("fail to get vconf key!");
-       }
 
-       if(_bt_hal_get_adapter_powered_state(&powered) == BT_STATUS_FAIL) {
+       if (_bt_hal_get_adapter_powered_state(&powered) == BT_STATUS_FAIL)
                ERR("_bt_hal_get_adapter_powered_state failed");
-       }
 
-       if((adapter_value == VCONFKEY_BT_STATUS_ON) && (powered == 1)) {
+       if ((adapter_value == VCONFKEY_BT_STATUS_ON) && (powered == 1)) {
                gboolean *user_data = g_new0(int, 1);
                *user_data = TRUE;
                g_idle_add(__bt_hal_send_le_event, (gpointer)user_data);
@@ -316,11 +312,10 @@ int _bt_hal_dbus_disable_le(void)
        int adapter_value = VCONFKEY_BT_STATUS_OFF;
 
        DBG("+");
-       if (vconf_get_int(VCONFKEY_BT_STATUS, &adapter_value) != 0) {
+       if (vconf_get_int(VCONFKEY_BT_STATUS, &adapter_value) != 0)
                ERR("fail to get vconf key!");
-       }
 
-       if(adapter_value == VCONFKEY_BT_STATUS_ON) {
+       if (adapter_value == VCONFKEY_BT_STATUS_ON) {
                gboolean *user_data = g_new0(int, 1);
                *user_data = FALSE;
                g_idle_add(__bt_hal_send_le_event, (gpointer)user_data);
@@ -485,15 +480,14 @@ static void ___bt_fill_le_supported_features(const char *item,
 {
        DBG("+");
 
-       if (g_strcmp0(item, "adv_inst_max") == 0) {
+       if (g_strcmp0(item, "adv_inst_max") == 0)
                le_features[1] = atoi(value);
-       } else if (g_strcmp0(item, "rpa_offloading") == 0) {
+       else if (g_strcmp0(item, "rpa_offloading") == 0)
                le_features[2] = atoi(value);
-       } else if (g_strcmp0(item, "max_filter") == 0) {
+       else if (g_strcmp0(item, "max_filter") == 0)
                le_features[4] = atoi(value);
-       } else {
+       else
                DBG("No registered item");
-       }
 
        /*
         * TODO: Need to check these usages for Bluez Case. In Bluedroid case,
@@ -546,7 +540,7 @@ static gboolean __bt_adapter_all_properties_cb(gpointer user_data)
        DBG("@@Start parsing properties");
        g_variant_get(result, "(a{sv})", &property_iter);
        while (g_variant_iter_loop(property_iter, "{sv}", &key, &value)) {
-               if(!g_strcmp0(key, "Address")) {
+               if (!g_strcmp0(key, "Address")) {
                        uint8_t bdaddr[6];
 
                        address = (gchar *) g_variant_get_string(value, NULL);
@@ -619,7 +613,7 @@ static gboolean __bt_adapter_all_properties_cb(gpointer user_data)
                        char **uuid_value;
                        int uuid_count = 0;
                        gsize size1 = 0;
-                       int i =0;
+                       int i = 0;
                        size1 = g_variant_get_size(value);
                        int num_props_tmp = ev->num_props;
                        if (size1 > 0) {
@@ -774,7 +768,7 @@ int _bt_hal_get_adapter_powered_state(uint8_t *state)
        int ret = BT_STATUS_FAIL;
 
        /* Check Valid Adapter Path, followed by Adapter Powered state.
-           If any of these fails, adapter will be considered Disabled */
+          If any of these fails, adapter will be considered Disabled */
        adapter_path = _bt_hal_get_adapter_path();
 
        if (adapter_path == NULL) {
@@ -832,7 +826,7 @@ static gboolean __bt_adapter_discovery_timeout_cb(gpointer user_data)
 
        if (size > 2) {
                DBG("Send Adapter Properties changed event to HAL user,"
-                       " Num Prop [%d] total size [%d]",ev->num_props, size);
+                       " Num Prop [%d] total size [%d]", ev->num_props, size);
                event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, (void*) buf, size);
        }
 done:
@@ -928,7 +922,7 @@ static gboolean __bt_adapter_scan_mode_cb(gpointer user_data)
 
        if (size > 2) {
                DBG("Send Adapter Properties changed event to HAL user,"
-                       " Num Prop [%d] total size [%d]",ev->num_props, size);
+                       " Num Prop [%d] total size [%d]", ev->num_props, size);
                event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, (void*) buf, size);
        }
 done:
@@ -1060,7 +1054,7 @@ static gboolean __bt_adapter_local_version_cb(gpointer user_data)
 
        if (size > 2) {
                DBG("Send Adapter Properties changed event to HAL user,"
-                       " Num Prop [%d] total size [%d]",ev->num_props, size);
+                       " Num Prop [%d] total size [%d]", ev->num_props, size);
                event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, (void*) buf, size);
        }
 done:
@@ -1139,7 +1133,7 @@ static gboolean __bt_adapter_local_name_cb(gpointer user_data)
                        strlen(name) + 1, name);
 
        ev->num_props++;
-       DBG("Device name [%s] property Num [%d]",name, ev->num_props);
+       DBG("Device name [%s] property Num [%d]", name, ev->num_props);
 
        if (!event_cb)
                event_cb = _bt_get_adapter_event_cb();
@@ -1150,7 +1144,7 @@ static gboolean __bt_adapter_local_name_cb(gpointer user_data)
 
        if (size > 2) {
                DBG("Send Adapter Properties changed event to HAL user,"
-                       " Num Prop [%d] total size [%d]",ev->num_props, size);
+                       " Num Prop [%d] total size [%d]", ev->num_props, size);
                event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, (void*) buf, size);
        }
 done:
@@ -1231,7 +1225,7 @@ static gboolean __bt_adapter_local_address_cb(gpointer user_data)
                        sizeof(bdaddr), bdaddr);
 
        ev->num_props++;
-       DBG("Device address [%s] property Num [%d]",address, ev->num_props);
+       DBG("Device address [%s] property Num [%d]", address, ev->num_props);
 
        size += __bt_insert_hal_properties(buf + size, HAL_PROP_ADAPTER_ADDR,
                        sizeof(bdaddr), bdaddr);
@@ -1245,7 +1239,7 @@ static gboolean __bt_adapter_local_address_cb(gpointer user_data)
 
        if (size > 1) {
                DBG("Send Device found event to HAL user,"
-                       " Num Prop [%d] total size [%d]",ev->num_props, size);
+                       " Num Prop [%d] total size [%d]", ev->num_props, size);
                event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, (void*) buf, size);
        }
 done:
@@ -1290,11 +1284,10 @@ int _bt_hal_dbus_get_local_address(void)
        g_variant_get(result, "(v)", &temp);
        address = g_variant_dup_string(temp, NULL);
 
-       if (address) {
+       if (address)
                DBG("Address:%s", address);
-       } else {
+       else
                return BT_STATUS_FAIL;
-       }
 
        g_variant_unref(result);
        g_variant_unref(temp);
@@ -1438,7 +1431,7 @@ static gboolean __is_device_paired(GVariantIter *item_iter)
        gchar *key;
 
        while (g_variant_iter_loop(item_iter, "{sv}", &key, &value)) {
-               if (NULL == key || g_strcmp0(key,"Paired"))
+               if (NULL == key || g_strcmp0(key, "Paired"))
                        continue;
 
                paired = g_variant_get_boolean(value);
@@ -1481,7 +1474,7 @@ static gboolean __bt_adapter_bonded_devices_cb(gpointer user_data)
 
        /* Parse the signature: {oa{sa{sv}}} */
        while (g_variant_iter_loop(iter, "{&oa{sa{sv}}}", &object_path, &interface_iter)) {
-               if(object_path == NULL)
+               if (object_path == NULL)
                        continue;
 
                while (g_variant_iter_loop(interface_iter, "{sa{sv}}",
@@ -1522,7 +1515,7 @@ static gboolean __bt_adapter_bonded_devices_cb(gpointer user_data)
 
        if (size > 2) {
                DBG("Send Adapter properties changed event to HAL user,"
-                       " Num Prop [%d] total size [%d]",ev->num_props, size);
+                       " Num Prop [%d] total size [%d]", ev->num_props, size);
                event_cb(HAL_EV_ADAPTER_PROPS_CHANGED, (void*) buf, size);
        }
 done: