Merge "A2DP profile multiple source support" into tizen

[platform/core/connectivity/bluetooth-frwk.git] / test / gatt-test / bluetooth-gatt-test.c

diff --git a/test/gatt-test/bluetooth-gatt-test.c b/test/gatt-test/bluetooth-gatt-test.c
index fdf0928..cb7ef22 100755 (executable)
--- a/test/gatt-test/bluetooth-gatt-test.c
+++ b/test/gatt-test/bluetooth-gatt-test.c
@@ -28,8 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 #include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus.h>
 #include "bluetooth-api.h"
 
 
@@ -112,11 +110,6 @@ char * get_bd_from_file(char *filename)
        }
 
        buf = g_malloc0(20);
-       /* Fix : NULL_RETURNS */
-       if (buf == NULL) {
-               close(fd);
-               return NULL;
-       }
 
        if (read(fd, buf, 17) < 17) {
                perror("Can't load firmware");
@@ -137,7 +130,7 @@ static void __accept_bdaddress(bluetooth_device_address_t *device_address)
 
        addr = get_bd_from_file(BD_ADDR_FILE);
        if (addr) {
-               TC_PRT("Remote bd adress from file: %s", addr);
+               TC_PRT("Remote bd address from file: %s", addr);
                convert_addr_string_to_addr_type(device_address, addr);
                g_free(addr);
                return;
@@ -297,7 +290,7 @@ static gboolean key_event_cb(GIOChannel *chan, GIOCondition cond, gpointer data)
        unsigned int len = 0;
        int test_id;
 
-       if (g_io_channel_read_chars(chan, buf, sizeof(buf), 
+       if (g_io_channel_read_chars(chan, buf, sizeof(buf),
                        &len, NULL) ==  G_IO_STATUS_ERROR) {
                printf("IO Channel read error");
                return FALSE;