Fix build error & warnings

Change-Id: I8e1dbb5a94a4997fcbee5685c9ea6e62975e9340
Signed-off-by: Atul Rai <a.rai@samsung.com>

diff --git a/bt-api/bt-gatt-client.c b/bt-api/bt-gatt-client.c
index 7eb5997..2c1e3ee 100755 (executable)
--- a/bt-api/bt-gatt-client.c
+++ b/bt-api/bt-gatt-client.c
@@ -489,7 +489,7 @@ static void __bluetooth_internal_get_char_cb(GDBusProxy *proxy,
        g_variant_get(char_value, "ao", &char_iter);
 
        gp_array = g_ptr_array_new();
-       while (g_variant_iter_loop(char_iter, "&o",  &char_handle));
+       while (g_variant_iter_loop(char_iter, "&o",  &char_handle))
                g_ptr_array_add(gp_array, (gpointer)char_handle);
 
        if (gp_array->len != 0) {

diff --git a/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c b/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c
index 9377417..b66560e 100644 (file)
--- a/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c
+++ b/bt-oal/bluez_hal/src/bt-hal-dbus-common-utils.c
@@ -231,7 +231,7 @@ void _bt_set_control_device_path(const char *path)
 
 void _bt_remove_control_device_path(const char *path)
 {
-       if(path == NULL);
+       if (path == NULL)
                return;
 
        if (avrcp_control_path &&

diff --git a/bt-oal/oal-avrcp-ctrl.c b/bt-oal/oal-avrcp-ctrl.c
index d560386..aec7461 100644 (file)
--- a/bt-oal/oal-avrcp-ctrl.c
+++ b/bt-oal/oal-avrcp-ctrl.c
@@ -213,19 +213,11 @@ static void cb_avrcp_ct_connection_state(bool rc_connect, bool bt_connect, bt_bd
        event_data = g_new0(bt_address_t, 1);
        memcpy(event_data->addr, bd_addr->address, BT_ADDRESS_BYTES_NUM);
 
-       switch(rc_connect) {
-       case BTRC_CONNECTION_STATE_CONNECTED:
+       if (rc_connect)
                event = OAL_EVENT_AVRCP_CTRL_CONNECTED;
-               break;
-       case BTRC_CONNECTION_STATE_DISCONNECTED:
+       else
                event = OAL_EVENT_AVRCP_CTRL_DISCONNECTED;
-               break;
-       default:
-               BT_INFO("Invalid state");
-               g_free(event_data);
-               event_data = NULL;
-               return;
-       }
+
        send_event_bda_trace(event, event_data, sizeof(bt_address_t), (bt_address_t*)bd_addr);
 }
 

diff --git a/bt-service-adaptation/services/bt-service-dpm.c b/bt-service-adaptation/services/bt-service-dpm.c
index 4cf40e5..c52c6e5 100644 (file)
--- a/bt-service-adaptation/services/bt-service-dpm.c
+++ b/bt-service-adaptation/services/bt-service-dpm.c
@@ -35,10 +35,10 @@ static dpm_policy_t policy_table[DPM_POLICY_END] = {
        [DPM_POLICY_ALLOW_BLUETOOTH] = { {DPM_BT_ERROR} },
        [DPM_POLICY_BLUETOOTH_DEVICE_RESTRICTION] = { {DPM_STATUS_ERROR} },
        [DPM_POLICY_BLUETOOTH_UUID_RESTRICTION] = { {DPM_STATUS_ERROR} },
-       [DPM_POLICY_BLUETOOTH_DEVICES_WHITELIST] = { {NULL} },
-       [DPM_POLICY_BLUETOOTH_DEVICES_BLACKLIST] = { {NULL} },
-       [DPM_POLICY_BLUETOOTH_UUIDS_WHITELIST] = { {NULL} },
-       [DPM_POLICY_BLUETOOTH_UUIDS_BLACKLIST] = { {NULL} },
+       [DPM_POLICY_BLUETOOTH_DEVICES_WHITELIST] = { { } },
+       [DPM_POLICY_BLUETOOTH_DEVICES_BLACKLIST] = { { } },
+       [DPM_POLICY_BLUETOOTH_UUIDS_WHITELIST] = { { } },
+       [DPM_POLICY_BLUETOOTH_UUIDS_BLACKLIST] = { { } },
        [DPM_POLICY_ALLOW_BLUETOOTH_OUTGOING_CALL] = { {DPM_STATUS_ERROR} },
        [DPM_POLICY_BLUETOOTH_PAIRING_STATE] = { {DPM_STATUS_ERROR} },
        [DPM_POLICY_BLUETOOTH_DESKTOP_CONNECTIVITY_STATE] = { {DPM_STATUS_ERROR} },