Correct the feature check logic for GATT APIs

Change-Id: Ib6a6353ae5ee933f98a9aaea60b53336033985fd
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

diff --git a/src/bluetooth-gatt.c b/src/bluetooth-gatt.c
index 57751d01963028d6c6b8ed3202fbbeca63572b72..34072359d5803d734d22e4a817aa9f01e55549d3 100644 (file)
--- a/src/bluetooth-gatt.c
+++ b/src/bluetooth-gatt.c
@@ -889,7 +889,7 @@ int bt_gatt_disconnect(const char *address)
 int bt_gatt_set_connection_state_changed_cb(bt_gatt_connection_state_changed_cb callback,
                                                        void *user_data)
 {
-       BT_CHECK_GATT_CLIENT_SUPPORT();
+       BT_CHECK_GATT_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(callback);
        _bt_set_cb(BT_EVENT_GATT_CONNECTION_STATUS, callback, user_data);
@@ -899,7 +899,7 @@ int bt_gatt_set_connection_state_changed_cb(bt_gatt_connection_state_changed_cb
 
 int bt_gatt_unset_connection_state_changed_cb(void)
 {
-       BT_CHECK_GATT_CLIENT_SUPPORT();
+       BT_CHECK_GATT_SUPPORT();
        BT_CHECK_INIT_STATUS();
        _bt_unset_cb(BT_EVENT_GATT_CONNECTION_STATUS);
        return BT_ERROR_NONE;
@@ -1261,7 +1261,7 @@ int bt_gatt_characteristic_destroy(bt_gatt_h gatt_handle)
 {
        bt_gatt_common_s *handle = (bt_gatt_common_s *)gatt_handle;
 
-       BT_CHECK_GATT_SERVER_SUPPORT();
+       BT_CHECK_GATT_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(gatt_handle);
 
@@ -1279,7 +1279,7 @@ int bt_gatt_descriptor_destroy(bt_gatt_h gatt_handle)
 {
        bt_gatt_common_s *handle = (bt_gatt_common_s *)gatt_handle;
 
-       BT_CHECK_GATT_SERVER_SUPPORT();
+       BT_CHECK_GATT_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(gatt_handle);
 
@@ -1899,7 +1899,7 @@ int bt_gatt_service_create(const char *uuid, bt_gatt_service_type_e type,
 {
        bt_gatt_service_s *svc;
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        BT_CHECK_INPUT_PARAMETER(uuid);
@@ -1933,7 +1933,7 @@ int bt_gatt_service_add_characteristic(bt_gatt_h service,
        bt_gatt_service_s *svc = (bt_gatt_service_s *)service;
        bt_gatt_characteristic_s *chr = (bt_gatt_characteristic_s *)characteristic;
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        BT_CHECK_INPUT_PARAMETER(service);
@@ -1958,7 +1958,7 @@ int bt_gatt_service_add_included_service(bt_gatt_h service,
        bt_gatt_service_s *svc = (bt_gatt_service_s *)service;
        bt_gatt_service_s *included_svc = (bt_gatt_service_s *)included_service;
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        BT_CHECK_INPUT_PARAMETER(service);
@@ -2194,7 +2194,7 @@ int bt_gatt_characteristic_create(const char *uuid, int permissions,
        int ret = BT_ERROR_NONE;
        bt_gatt_characteristic_s *chr = NULL;
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        BT_CHECK_INPUT_PARAMETER(uuid);
@@ -2258,7 +2258,7 @@ int bt_gatt_characteristic_add_descriptor(bt_gatt_h characteristic,
        bt_gatt_characteristic_s *chr = (bt_gatt_characteristic_s *)characteristic;
        bt_gatt_descriptor_s *desc = (bt_gatt_descriptor_s *)descriptor;
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        BT_CHECK_INPUT_PARAMETER(characteristic);
@@ -2486,7 +2486,7 @@ int bt_gatt_descriptor_create(const char *uuid, int permissions,
        int ret = BT_ERROR_NONE;
        bt_gatt_descriptor_s *desc = NULL;
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        BT_CHECK_INPUT_PARAMETER(uuid);
@@ -2559,7 +2559,7 @@ int bt_gatt_descriptor_get_characteristic(bt_gatt_h descriptor,
 
 int bt_gatt_server_initialize(void)
 {
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        int ret = BT_ERROR_NONE;
@@ -2596,7 +2596,7 @@ int bt_gatt_server_initialize(void)
 
 int bt_gatt_server_deinitialize(void)
 {
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_SERVER_SUPPORT();
        BT_CHECK_INIT_STATUS();
 
        int ret = BT_ERROR_NONE;
@@ -3795,7 +3795,7 @@ int bt_gatt_client_write_value(bt_gatt_h gatt_handle,
        bluetooth_gatt_att_data_t write_data;
 
        BT_INFO("+");
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_CLIENT_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(gatt_handle);
        BT_CHECK_INPUT_PARAMETER(callback); /* LCOV_EXCL_START */
@@ -4261,7 +4261,7 @@ int bt_gatt_client_set_characteristic_value_changed_cb(bt_gatt_h characteristic,
 
        BT_INFO("+");
 
-       BT_CHECK_GATT_SUPPORT();
+       BT_CHECK_GATT_CLIENT_SUPPORT();
        BT_CHECK_INIT_STATUS();
        BT_CHECK_INPUT_PARAMETER(characteristic);
        BT_CHECK_INPUT_PARAMETER(callback);