Merge "code clean up" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-hid-device.c

diff --git a/bt-api/bt-hid-device.c b/bt-api/bt-hid-device.c
index cfbb33c..e0e8a53 100644 (file)
--- a/bt-api/bt-hid-device.c
+++ b/bt-api/bt-hid-device.c
@@ -97,10 +97,10 @@ static GVariant* __bt_hid_agent_dbus_send(const char *path,
        GDBusProxy *proxy = NULL;
        GDBusConnection *conn = NULL;
 
-       conn = _bt_gdbus_get_system_gconn();
+       conn = _bt_get_system_private_conn();
        retv_if(conn == NULL, NULL);
 
-       proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
+       proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
                NULL, BT_HID_SERVICE_NAME, path, interface, NULL, err);
        if (proxy == NULL) {
                BT_ERR("Unable to allocate new proxy");
@@ -120,7 +120,7 @@ static hid_connected_device_info_t *__find_hid_info_with_address(const char *rem
 
        for (l = device_list; l != NULL; l = l->next) {
                hid_connected_device_info_t *info = l->data;
-               if (g_strcmp0((const char *)info->address, (const char *)remote_addr) == 0)
+               if (strcasecmp((const char *)info->address, (const char *)remote_addr) == 0)
                        return info;
        }
        return NULL;
@@ -303,18 +303,16 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                        BT_INFO("TRANS HANDSHAKE");
                        recv_data.type = HTYPE_TRANS_HANDSHAKE;
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                break;
 
                case BT_HID_TRANS_HID_CONTROL:
                        BT_INFO("HID CONTROL");
                        recv_data.type = HTYPE_TRANS_HID_CONTROL;
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                break;
 
                case BT_HID_TRANS_DATA:
@@ -324,16 +322,14 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                                BT_INFO("Input Report");
                                recv_data.param = PTYPE_DATA_RTYPE_INPUT;
                                recv_data.buffer_size = len;
-                               recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                               if (recv_data.buffer)
-                                       memcpy(recv_data.buffer, buffer, len);
+                               recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                               memcpy(recv_data.buffer, buffer, len);
                        } else {
                                BT_INFO("Out Report");
                                recv_data.param = PTYPE_DATA_RTYPE_OUTPUT;
                                recv_data.buffer_size = len;
-                               recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                               if (recv_data.buffer)
-                                       memcpy(recv_data.buffer, buffer, len);
+                               recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                               memcpy(recv_data.buffer, buffer, len);
                        }
                break;
 
@@ -348,9 +344,8 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                                recv_data.param = PTYPE_DATA_RTYPE_OUTPUT;
                        }
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                        break;
                }
 
@@ -365,9 +360,8 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                                recv_data.param = PTYPE_DATA_RTYPE_OUTPUT;
                        }
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                        break;
                }
 
@@ -376,9 +370,8 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                        recv_data.type = HTYPE_TRANS_GET_PROTOCOL;
                        recv_data.param = PTYPE_DATA_RTYPE_INPUT;
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                        break;
                }
 
@@ -387,9 +380,8 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                        recv_data.type = HTYPE_TRANS_SET_PROTOCOL;
                        recv_data.param = PTYPE_DATA_RTYPE_INPUT;
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                        break;
                }
 
@@ -398,9 +390,8 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                        recv_data.type = HTYPE_TRANS_GET_IDLE;
                        recv_data.param = PTYPE_DATA_RTYPE_INPUT;
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                        break;
                }
 
@@ -409,9 +400,8 @@ static gboolean __received_cb(GIOChannel *chan, GIOCondition cond,
                        recv_data.type = HTYPE_TRANS_SET_IDLE;
                        recv_data.param = PTYPE_DATA_RTYPE_INPUT;
                        recv_data.buffer_size = len;
-                       recv_data.buffer = (char *) malloc(sizeof(char) * len);
-                       if (recv_data.buffer)
-                               memcpy(recv_data.buffer, buffer, len);
+                       recv_data.buffer = (char *)g_malloc0(sizeof(char) * len);
+                       memcpy(recv_data.buffer, buffer, len);
                        break;
                }
 
@@ -482,13 +472,13 @@ int _bt_hid_device_get_fd(const char *address, int *ctrl, int *intr)
        int index1 = 0;
        int index2 = 0;
        GUnixFDList *out_fd_list = NULL;
-       conn = _bt_gdbus_get_system_gconn();
+       conn = _bt_get_system_private_conn();
        retv_if(conn == NULL, BLUETOOTH_ERROR_INTERNAL);
 
        adapter_path = _bt_get_device_object_path((char *)address);
        retv_if(adapter_path == NULL, BLUETOOTH_ERROR_INTERNAL);
        BT_INFO_C("Device : %s", adapter_path);
-       server_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_NONE,
+       server_proxy = g_dbus_proxy_new_sync(conn, G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES,
                        NULL, BT_BLUEZ_NAME,
                        adapter_path, "org.bluez.Input1",  NULL, NULL);
        g_free(adapter_path);