Fix the build warning error in tizen patch codes

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

diff --git a/obexd/src/obex.h b/obexd/src/obex.h
index fc16747..258b900 100755 (executable)
--- a/obexd/src/obex.h
+++ b/obexd/src/obex.h
@@ -50,3 +50,9 @@ int obex_getsockname(struct obex_session *os, char **name);
 
 /* Just a thin wrapper around memcmp to deal with NULL values */
 int memncmp0(const void *a, size_t na, const void *b, size_t nb);
+
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+void obex_convert_device_path_to_address(const char *device_path, char *device_address);
+int obex_object_path_to_uuid(const char *path);
+void obex_session_disconnect(const char *uuid_path, const char *device_path);
+#endif

diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index 5cb7c17..ba65224 100644 (file)
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -1011,7 +1011,7 @@ static gboolean send_broadcom_a2dp_qos(const bdaddr_t *dst, gboolean qos_high)
        return TRUE;
 }
 
-static gboolean send_sprd_a2dp_qos(bdaddr_t *dst, gboolean qos_high)
+static gboolean send_sprd_a2dp_qos(const bdaddr_t *dst, gboolean qos_high)
 {
        int dd;
        int err = 0;

diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c
index 3d85ded..7de8a63 100644 (file)
--- a/profiles/audio/avrcp.c
+++ b/profiles/audio/avrcp.c
@@ -4021,8 +4021,8 @@ static gboolean avrcp_get_playback_status(gpointer user_data)
 }
 #endif
 
-static gboolean avrcp_get_capabilities_resp(struct avctp *conn,
-                                       uint8_t code, uint8_t subunit,
+static gboolean avrcp_get_capabilities_resp(struct avctp *conn, uint8_t code,
+                                       uint8_t subunit, uint8_t transaction,
                                        uint8_t *operands, size_t operand_count,
                                        void *user_data)
 {

diff --git a/profiles/audio/media.c b/profiles/audio/media.c
index e7a16d7..c714798 100755 (executable)
--- a/profiles/audio/media.c
+++ b/profiles/audio/media.c
@@ -787,6 +787,7 @@ static struct a2dp_endpoint a2dp_endpoint = {
        .set_delay = set_delay
 };
 
+#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
 static void a2dp_destroy_endpoint(void *user_data)
 {
        struct media_endpoint *endpoint = user_data;
@@ -794,6 +795,7 @@ static void a2dp_destroy_endpoint(void *user_data)
        endpoint->sep = NULL;
        release_endpoint(endpoint);
 }
+#endif
 
 static gboolean endpoint_init_a2dp_source(struct media_endpoint *endpoint,
                                                gboolean delay_reporting,
@@ -1015,36 +1017,6 @@ static struct media_endpoint *media_endpoint_create(struct media_adapter *adapte
        return endpoint;
 }
 
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-static int parse_a2dp_uuid(DBusMessageIter *props, const char **uuid)
-{
-       gboolean has_uuid = FALSE;
-
-       while (dbus_message_iter_get_arg_type(props) == DBUS_TYPE_DICT_ENTRY) {
-               const char *key;
-               DBusMessageIter value, entry;
-               int var;
-
-               dbus_message_iter_recurse(props, &entry);
-               dbus_message_iter_get_basic(&entry, &key);
-
-               dbus_message_iter_next(&entry);
-               dbus_message_iter_recurse(&entry, &value);
-
-               var = dbus_message_iter_get_arg_type(&value);
-               if (strcasecmp(key, "UUID") == 0) {
-                       if (var != DBUS_TYPE_STRING)
-                               return -EINVAL;
-                       dbus_message_iter_get_basic(&value, uuid);
-                       has_uuid = TRUE;
-               }
-               dbus_message_iter_next(props);
-       }
-
-       return has_uuid ? 0 : -EINVAL;
-}
-#endif
-
 static int parse_properties(DBusMessageIter *props, const char **uuid,
                                gboolean *delay_reporting, uint8_t *codec,
                                uint8_t **capabilities, int *size)
@@ -1100,10 +1072,8 @@ static DBusMessage *a2dp_select_role(DBusConnection *conn, DBusMessage *msg,
                                        void *data)
 {
        struct media_adapter *adapter = data;
-       DBusMessageIter args, props;
        const char *a2dp_role;
        gboolean ret;
-       int err;
 
        if (!dbus_message_get_args(msg, NULL,
                                DBUS_TYPE_STRING, &a2dp_role,

diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c
index a70d475..08fd8be 100644 (file)
--- a/profiles/proximity/monitor.c
+++ b/profiles/proximity/monitor.c
@@ -561,7 +561,9 @@ static void property_set_immediate_alert_level(
                GDBusPendingPropertySet id, void *data)
 {
        struct monitor *monitor = data;
+#ifndef TIZEN_FEATURE_BLUEZ_MODIFY
        struct btd_device *device = monitor->device;
+#endif
        const char *level;
 
        if (dbus_message_iter_get_arg_type(iter) != DBUS_TYPE_STRING) {

diff --git a/profiles/tds/manager.c b/profiles/tds/manager.c
index f86718f..e7ec0fe 100755 (executable)
--- a/profiles/tds/manager.c
+++ b/profiles/tds/manager.c
@@ -60,13 +60,12 @@ static int tds_device_probe(struct btd_service *service)
        return 0;
 }
 
-static int tds_device_remove(struct btd_service *service)
+static void tds_device_remove(struct btd_service *service)
 {
        struct btd_device *device = btd_service_get_device(service);
        DBG("device path %s", device_get_path(device));
        tds_seeker_disconnected(device_get_adapter(device), device);
        btd_service_disconnecting_complete(service, 0);
-       return 0;
 }
 
 static int tds_device_accepted(struct btd_service *service)

diff --git a/profiles/tds/tds.c b/profiles/tds/tds.c
index 87b9cd8..64af8aa 100755 (executable)
--- a/profiles/tds/tds.c
+++ b/profiles/tds/tds.c
@@ -116,11 +116,12 @@ find_tds_service_adapter(struct btd_adapter *adapter)
        return l->data;
 }
 
-static struct btd_device *
-tds_get_connected_device(struct connected_device *con_dev)
+#if 0
+static struct btd_device *tds_get_connected_device(struct connected_device *con_dev)
 {
        return con_dev->device;
 }
+#endif
 
 static int device_cmp(gconstpointer a, gconstpointer b)
 {

diff --git a/src/adapter.c b/src/adapter.c
index 7b93650..b38363f 100644 (file)
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2892,14 +2892,14 @@ static void le_discovery_disconnect(DBusConnection *conn, void *user_data)
 }
 
 #ifdef TIZEN_FEATURE_PLATFROM_SCAN_FILTER
-static void addr_filter_params_free(gpointer data, gpointer user_data)
+static void addr_filter_params_free(gpointer data)
 {
        adapter_le_address_filter_params_t *params = data;
 
        g_free(params);
 }
 
-static void uuid_filter_params_free(gpointer data, gpointer user_data)
+static void uuid_filter_params_free(gpointer data)
 {
        adapter_le_uuid_params_t *params = data;
 
@@ -2908,7 +2908,7 @@ static void uuid_filter_params_free(gpointer data, gpointer user_data)
        g_free(params);
 }
 
-static void manufacturer_filter_params_free(gpointer data, gpointer user_data)
+static void manufacturer_filter_params_free(gpointer data)
 {
        adapter_le_manf_data_params_t *params = data;
 
@@ -2917,7 +2917,7 @@ static void manufacturer_filter_params_free(gpointer data, gpointer user_data)
        g_free(params);
 }
 
-static void local_name_filter_params_free(gpointer data, gpointer user_data)
+static void local_name_filter_params_free(gpointer data)
 {
        adapter_le_local_name_params_t *params = data;
 
@@ -2925,7 +2925,7 @@ static void local_name_filter_params_free(gpointer data, gpointer user_data)
        g_free(params);
 }
 
-static void service_data_filter_params_free(gpointer data, gpointer user_data)
+static void service_data_filter_params_free(gpointer data)
 {
        adapter_le_service_data_params_t *params = data;
 
@@ -2934,7 +2934,7 @@ static void service_data_filter_params_free(gpointer data, gpointer user_data)
        g_free(params);
 }
 
-static void scan_filter_params_free(gpointer data, gpointer user_data)
+static void scan_filter_params_free(gpointer data)
 {
        adapter_le_scan_filter_param_t *params = data;
        g_free(params);
@@ -2967,7 +2967,9 @@ int adapter_le_manufacturer_data_cmp(gconstpointer a, gconstpointer b)
                /* if the advertisiement packet is an iBeacon */
                if (msd->company == COMPANY_ID_APPLE)
                        return 0;
-               return strncasecmp((const char *)params->man_data, msd->data, params->man_data_len);
+               return strncasecmp((const char *)params->man_data,
+                                               (const char *)msd->data,
+                                               params->man_data_len);
        } else {
                return -1;
        }
@@ -2987,7 +2989,9 @@ int adapter_le_service_data_cmp(gconstpointer a, gconstpointer b)
        const struct eir_sd *sd = b;
        /* Todo, the service data format for 16 bit, 32bit and
         * 128 bit uuids needs to addressed */
-       return strncasecmp((const char *)(params->service_data), sd->data, sd->data_len);
+       return strncasecmp((const char *)(params->service_data),
+                                       (const char *)sd->data,
+                                       sd->data_len);
 }
 
 int adapter_le_address_filter_index_cmp(gconstpointer a, gconstpointer b)
@@ -3196,15 +3200,15 @@ static gboolean adapter_le_service_add_uuid_scan_filter_data(struct btd_adapter
 
        if (uuid_mask_len == UUID_16_LEN) {
                uint16_t *uuid16 = (void *)p_uuid;
-               sdp_uuid16_create(&uuid, get_be16(uuid16));
+               sdp_uuid16_create((uuid_t *)&uuid, get_be16(uuid16));
        } else if (uuid_mask_len == UUID_32_LEN) {
                uint32_t *uuid32 = (void *)p_uuid;
-               sdp_uuid32_create(&uuid, get_be32(uuid32));
+               sdp_uuid32_create((uuid_t *)&uuid, get_be32(uuid32));
        } else {
-               sdp_uuid128_create(&uuid, p_uuid);
+               sdp_uuid128_create((uuid_t *)&uuid, p_uuid);
        }
        params->filter_index = filter_index;
-       params->uuid = bt_uuid2string(&uuid);
+       params->uuid = (uint8_t *)bt_uuid2string((uuid_t *)&uuid);
        params->uuid_mask = g_new0(uint8_t, uuid_mask_len);
         memcpy(params->uuid_mask, p_uuid_mask, uuid_mask_len);
        params->uuid_len = uuid_mask_len;
@@ -3424,7 +3428,7 @@ static gboolean adapter_le_service_add_service_scan_filter_data(struct btd_adapt
        return TRUE;
 }
 
-static adapter_le_service_data_params_t *adapter_le_service_find_service_scan_filter_data(
+static adapter_le_service_data_params_t* adapter_le_service_find_service_scan_filter_data(
                                                        struct btd_adapter *adapter, struct eir_sd *sd)
 {
        GSList *list;
@@ -3496,7 +3500,7 @@ static gboolean adapter_le_service_add_scan_filter_params(struct btd_adapter *ad
        return TRUE;
 }
 
-static adapter_le_service_data_params_t *adapter_le_service_find_scan_filter_params(
+static adapter_le_scan_filter_param_t *adapter_le_service_find_scan_filter_params(
                                                        struct btd_adapter *adapter, int filter_index)
 {
        GSList *list;
@@ -7276,6 +7280,7 @@ static struct conn_param *get_conn_param(GKeyFile *key_file, const char *peer,
        return param;
 }
 
+#if 0
 static int generate_and_write_irk(uint8_t *irk, GKeyFile *key_file,
                                                        const char *filename)
 {
@@ -7351,7 +7356,6 @@ static int load_irk(struct btd_adapter *adapter, uint8_t *irk)
        return 0;
 }
 
-#if 0
 static void set_privacy_complete(uint8_t status, uint16_t length,
                                        const void *param, void *user_data)
 {

diff --git a/src/device.c b/src/device.c
index bc5d749..9f4ba51 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -1485,9 +1485,9 @@ static gboolean dev_property_get_ipsp_conn_bt_iface_name(const GDBusPropertyTabl
                                DBusMessageIter *iter, void *data)
 {
        struct btd_device *dev = data;
-       const char *ptr = g_strdup(dev->if_name);
+       char *ptr = g_strdup(dev->if_name);
 
-       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, &ptr);
+       dbus_message_iter_append_basic(iter, DBUS_TYPE_STRING, (const char **)&ptr);
 
        g_free(ptr);
 
@@ -3699,7 +3699,6 @@ static DBusMessage *disconnect_otc(DBusConnection *conn, DBusMessage *msg,
 {
        struct btd_device *device = user_data;
        struct otc_conn_info *info = NULL;
-       GError *gerr = NULL;
        GSList *l;
        int sock;
 
@@ -7549,8 +7548,7 @@ void btd_device_set_trusted(struct btd_device *device, gboolean trusted)
 }
 
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-void device_disconnect_blocked(struct btd_device *device,
-                                                       const char *uuid)
+void device_disconnect_blocked(struct btd_device *device, char *uuid)
 {
        struct btd_service *service;
        GSList *l;
@@ -7576,9 +7574,9 @@ void btd_device_set_trusted_profiles(struct btd_device *device,
                uint32_t pbap, uint32_t map, uint32_t sap,
                uint32_t hfp_hs, uint32_t a2dp)
 {
-       char *uuid = NULL;
        if (!device)
                return;
+
        DBG("TrustedProfiles Parameters: [PBAP %d] [MAP %d] [SAP %d] [HFP %d] [A2DP %d]",
                        pbap, map, sap, hfp_hs, a2dp);
 

diff --git a/src/gatt-database.c b/src/gatt-database.c
index c198d17..38f3e73 100644 (file)
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -1904,10 +1904,7 @@ static uint8_t dbus_error_to_att_ecode(const char *error_name)
 static void read_reply_cb(DBusMessage *message, void *user_data)
 {
        struct pending_op *op = user_data;
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-       struct gatt_db_attribute *attrib = op->attrib;
-       bt_uuid_t *uuid = gatt_db_attribute_get_type(attrib);
-#endif
+
        DBusError err;
        DBusMessageIter iter, array;
        uint8_t ecode = 0;
@@ -2072,7 +2069,8 @@ static struct pending_op *send_read(struct btd_device *device,
 static void write_setup_cb(DBusMessageIter *iter, void *user_data)
 {
        struct pending_op *op = user_data;
-       DBusMessageIter array, dict;
+       DBusMessageIter array;
+
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        char dst_addr[18] = { 0 };
        char *addr_value = dst_addr;
@@ -2085,12 +2083,16 @@ static void write_setup_cb(DBusMessageIter *iter, void *user_data)
        dbus_message_iter_append_basic(iter, DBUS_TYPE_UINT16, &op->offset);
        dbus_message_iter_append_basic(iter, DBUS_TYPE_BOOLEAN, &response_needed);
 #endif
+
        dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "y", &array);
        dbus_message_iter_append_fixed_array(&array, DBUS_TYPE_BYTE,
                                        &op->data.iov_base, op->data.iov_len);
        dbus_message_iter_close_container(iter, &array);
 
 #ifndef TIZEN_FEATURE_BLUEZ_MODIFY
+{
+       DBusMessageIter dict;
+
        dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY,
                                        DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING
                                        DBUS_TYPE_STRING_AS_STRING
@@ -2101,6 +2103,7 @@ static void write_setup_cb(DBusMessageIter *iter, void *user_data)
        append_options(&dict, op);
 
        dbus_message_iter_close_container(iter, &dict);
+}
 #endif
 
        if (!op->owner_queue) {
@@ -2112,10 +2115,7 @@ static void write_setup_cb(DBusMessageIter *iter, void *user_data)
 static void write_reply_cb(DBusMessage *message, void *user_data)
 {
        struct pending_op *op = user_data;
-#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
-       struct gatt_db_attribute *attrib = op->attrib;
-       bt_uuid_t *uuid = gatt_db_attribute_get_type(attrib);
-#endif
+
        DBusError err;
        DBusMessageIter iter;
        uint8_t ecode = 0;

diff --git a/src/shared/gatt-server.h b/src/shared/gatt-server.h
index c61eabe..9f66b55 100755 (executable)
--- a/src/shared/gatt-server.h
+++ b/src/shared/gatt-server.h
@@ -23,6 +23,11 @@
 
 #include <stdint.h>
 
+#ifdef TIZEN_FEATURE_BLUEZ_MODIFY
+struct gatt_db;
+struct bt_att;
+#endif
+
 struct bt_gatt_server;
 
 struct bt_gatt_server *bt_gatt_server_new(struct gatt_db *db,