Fix BT_ERR log msg and strncpy build error

Change-Id: Icf1ece9e60678c01ab6c178d3f300318cc921f3a
Signed-off-by: Amit Purwar <amit.purwar@samsung.com>

diff --git a/src/bluetooth-adapter.c b/src/bluetooth-adapter.c
index 348a5ae..e3458e0 100644 (file)
--- a/src/bluetooth-adapter.c
+++ b/src/bluetooth-adapter.c
@@ -326,14 +326,14 @@ int bt_adapter_get_local_info(char **chipset, char **firmware,
 
                info_start = strstr(buf, "bluetooth");
                if (info_start == NULL) {
-                       BT_ERR("strstr() error(%s)", info_start);
+                       BT_ERR("strstr() error info_start is NULL");
                        ret = BT_ERROR_OPERATION_FAILED;
                        goto ERROR;
                }
                info_start += 10;
                info_end = strstr(buf, "hcd");
                if (info_end == NULL) {
-                       BT_ERR("strstr() error(%s)", info_end);
+                       BT_ERR("strstr() error info_end is NULL");
                        ret = BT_ERROR_OPERATION_FAILED;
                        goto ERROR;
                }
@@ -357,7 +357,7 @@ int bt_adapter_get_local_info(char **chipset, char **firmware,
 
                info_end = strchr(buf, '_');
                if (info_end == NULL) {
-                       BT_ERR("strchr() error(%s)", info_end);
+                       BT_ERR("strchr() error info_end is NULL");
                        ret = BT_ERROR_OPERATION_FAILED;
                        goto ERROR;
                }
@@ -412,7 +412,7 @@ int bt_adapter_get_local_info(char **chipset, char **firmware,
        info_start = buf;
        info_end = strchr(buf, ',');
        if (info_end == NULL) {
-               BT_ERR("strchr() error(%s)", info_end);
+               BT_ERR("strchr() error info_end is NULL");
                ret = BT_ERROR_OPERATION_FAILED;
                goto ERROR;
        }

diff --git a/test/bt_unit_test.c b/test/bt_unit_test.c
index 1d859b8..7ff1449 100644 (file)
--- a/test/bt_unit_test.c
+++ b/test/bt_unit_test.c
@@ -4096,10 +4096,9 @@ done:
 
                if (param_index > 0) {
                        int len = strlen(param);
-                       g_test_param.params[param_index - 1] = g_malloc0(len + 1);
                        /* Remove new line character */
                        param[len - 1] = '\0';
-                       strncpy(g_test_param.params[param_index - 1], param, strlen(param));
+                       g_test_param.params[param_index - 1] = g_strdup(param);
                }
 
                if (param_index  == g_test_param.param_count) {