Reduce the predefined logic (PredefinedPreprocessor)

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-event-handler.c

diff --git a/bt-api/bt-event-handler.c b/bt-api/bt-event-handler.c
index 492ec8c..79ce01a 100644 (file)
--- a/bt-api/bt-event-handler.c
+++ b/bt-api/bt-event-handler.c
@@ -1244,7 +1244,7 @@ void __bt_device_event_filter(GDBusConnection *connection,
 #endif
 
        ret_if(signal_name == NULL);
-#ifdef TIZEN_GATT_CLIENT
+
        if (strcasecmp(signal_name, BT_GATT_SERVER_CONNECTED) == 0) {
                const char *address = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -1285,28 +1285,6 @@ void __bt_device_event_filter(GDBusConnection *connection,
                _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CLIENT_DISCONNECTED,
                                result, &dev_address,
                                event_info->cb, event_info->user_data);
-#else
-       if (strcasecmp(signal_name, BT_GATT_CONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_CONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
-
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-       } else if (strcasecmp(signal_name, BT_GATT_DISCONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_DISCONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
-
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_common_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-#endif
        } else if (strcasecmp(signal_name, BT_GATT_REQ_ATT_MTU_CHANGED) == 0) {
                const char *address = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -1755,7 +1733,6 @@ void __bt_headset_event_filter(GDBusConnection *connection,
                _bt_headset_event_cb(BLUETOOTH_EVENT_AG_MIC_GAIN,
                                result, &gain,
                                event_info->cb, event_info->user_data);
-#ifdef TIZEN_FEATURE_BT_AVC_TARGET
        } else if (strcasecmp(signal_name, BT_AUDIO_AVC_MODE_CHANGED) == 0) {
                bool mode;
 
@@ -1772,7 +1749,6 @@ void __bt_headset_event_filter(GDBusConnection *connection,
                                result, &volume,
                                event_info->cb, event_info->user_data);
        }
-#endif
 }
 
 void __bt_hid_device_event_filter(GDBusConnection *connection,
@@ -3937,7 +3913,6 @@ static void __bt_event_data_free(void *data)
        g_free(cb_data);
 }
 
-#ifdef TIZEN_GATT_CLIENT
 static void __bt_gatt_client_event_filter(GDBusConnection *connection,
                const gchar *sender_name,
                const gchar *object_path,
@@ -4229,9 +4204,6 @@ static void __bt_gatt_client_event_filter(GDBusConnection *connection,
        }
 }
 
-#endif
-
-
 #ifndef GATT_DIRECT
 static void __bt_gatt_server_event_filter(GDBusConnection *connection,
                const gchar *sender_name,
@@ -4248,31 +4220,8 @@ static void __bt_gatt_server_event_filter(GDBusConnection *connection,
 
        event_info = (bt_event_info_t *)user_data;
        ret_if(event_info == NULL);
-#ifdef TIZEN_GATT_CLIENT
-       if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
-#else
-       if (strcasecmp(signal_name, BT_GATT_CONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_CONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
-
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_CONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-       } else if (strcasecmp(signal_name, BT_GATT_DISCONNECTED) == 0) {
-               const char *address = NULL;
-               bluetooth_device_address_t dev_address = { {0} };
-               BT_DBG("BT_GATT_DISCONNECTED");
-               g_variant_get(parameters, "(i&s)", &result, &address);
 
-               _bt_convert_addr_string_to_type(dev_address.addr, address);
-               _bt_gatt_server_event_cb(BLUETOOTH_EVENT_GATT_DISCONNECTED,
-                               result, &dev_address,
-                               event_info->cb, event_info->user_data);
-       } else if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
-#endif
+       if (strcasecmp(signal_name, BT_GATT_VALUE_CHANGED) == 0) {
                const char *address = NULL;
                GVariant *data_var = NULL;
                bluetooth_device_address_t dev_address = { {0} };
@@ -4537,13 +4486,10 @@ int _bt_register_event(int event_type, void *event_cb, void *user_data)
                path = BT_GATT_SERVER_PATH;
                break;
 #endif
-
-#ifdef TIZEN_GATT_CLIENT
        case BT_GATT_CLIENT_EVENT:
                event_func = __bt_gatt_client_event_filter;
                path = BT_GATT_CLIENT_PATH;
                break;
-#endif
        case BT_MESH_EVENT:
                event_func = __bt_mesh_event_filter;
                path = BT_MESH_PATH;