Merge "Modified dbus permission for obex" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-service / bt-service-proximity.c

diff --git a/bt-service/bt-service-proximity.c b/bt-service/bt-service-proximity.c
index 957bd6f..dadf5e4 100644 (file)
--- a/bt-service/bt-service-proximity.c
+++ b/bt-service/bt-service-proximity.c
@@ -84,14 +84,13 @@ int bt_set_proximity_property(bluetooth_device_address_t *device_address,
 
        device_path = _bt_get_device_object_path(address);
 
-       if (device_path == NULL) {
+       if (device_path == NULL)
                return BLUETOOTH_ERROR_NOT_CONNECTED;
-       } else {
+       else
                BT_INFO("device_path is created[%s]", device_path);
-       }
 
        value_str = _bt_convert_alert_level_to_string(alert_level);
-       property_str =_bt_convert_property_to_string(property);
+       property_str = _bt_convert_property_to_string(property);
 
        if (value_str == NULL || property_str == NULL) {
                g_free(property_str);
@@ -150,11 +149,10 @@ int bt_get_proximity_property(bluetooth_device_address_t *device_address,
 
        device_path = _bt_get_device_object_path(address);
 
-       if (device_path == NULL) {
+       if (device_path == NULL)
                return BLUETOOTH_ERROR_NOT_CONNECTED;
-       } else {
+       else
                BT_INFO("device_path is created[%s]", device_path);
-       }
 
        property_str = _bt_convert_property_to_string(property);
 
@@ -227,11 +225,10 @@ int bt_get_proximity_supported_services(bluetooth_device_address_t *device_addre
 
        device_path = _bt_get_device_object_path(address);
 
-       if (device_path == NULL) {
+       if (device_path == NULL)
                return BLUETOOTH_ERROR_NOT_CONNECTED;
-       } else {
+       else
                BT_INFO("device_path is created[%s]", device_path);
-       }
 
        proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
                                                        NULL, BT_BLUEZ_NAME,