From 8a1c9019e6a49fe7d36f12c271dcc690f32cb5f7 Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Wed, 22 Jun 2022 08:35:02 +0900 Subject: [PATCH] Modify a parameter to single pointer from double pointer Change-Id: I5b5e80478ebeb5e0676a0492050233c04e3a5a15 Signed-off-by: hyunuk.tak --- include/thread.h | 2 +- src/thread-br.c | 7 ++----- tests/thread-test/thread-br.c | 4 ++-- tests/unittest/thread-unittest-br.cpp | 5 ++--- 4 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/thread.h b/include/thread.h index 409a0eb..2706457 100644 --- a/include/thread.h +++ b/include/thread.h @@ -671,7 +671,7 @@ int thread_onmesh_prefix_set_ipv6_prefix(thread_onmesh_prefix_info_h onmesh_pref * @see thread_onmesh_prefix_destroy() */ int thread_onmesh_prefix_get_ipv6_prefix(thread_onmesh_prefix_info_h onmesh_prefix, - uint8_t **ipv6_prefix, uint8_t *ipv6_prefix_len); + uint8_t *ipv6_prefix, uint8_t *ipv6_prefix_len); /** * @ingroup CAPI_NETWORK_THREAD_BORDERROUTER_MODULE diff --git a/src/thread-br.c b/src/thread-br.c index aa60505..3fdbb3f 100644 --- a/src/thread-br.c +++ b/src/thread-br.c @@ -606,7 +606,7 @@ int thread_onmesh_prefix_set_ipv6_prefix(thread_onmesh_prefix_info_h onmesh_pref } int thread_onmesh_prefix_get_ipv6_prefix(thread_onmesh_prefix_info_h onmesh_prefix, - uint8_t **ipv6_prefix, uint8_t *ipv6_prefix_len) + uint8_t *ipv6_prefix, uint8_t *ipv6_prefix_len) { FUNC_ENTRY; THREAD_CHECK_SUPPORTED_FEATURE(THREAD_FEATURE_COMMON); @@ -615,10 +615,7 @@ int thread_onmesh_prefix_get_ipv6_prefix(thread_onmesh_prefix_info_h onmesh_pref thread_onmesh_prefix_info_s *onmesh_prefix_info = (thread_onmesh_prefix_info_s *)onmesh_prefix; - *ipv6_prefix = g_malloc0(THREAD_IPV6_PREFIX_SIZE*sizeof(uint8_t)); - retv_if (!ipv6_prefix, THREAD_ERROR_OUT_OF_MEMORY); - - memcpy(*ipv6_prefix, (onmesh_prefix_info->prefix).ipv6.fields.m8, + memcpy(ipv6_prefix, (onmesh_prefix_info->prefix).ipv6.fields.m8, THREAD_IPV6_PREFIX_SIZE*sizeof(uint8_t)); *ipv6_prefix_len = (onmesh_prefix_info->prefix).length; diff --git a/tests/thread-test/thread-br.c b/tests/thread-test/thread-br.c index 3d2987c..2518753 100644 --- a/tests/thread-test/thread-br.c +++ b/tests/thread-test/thread-br.c @@ -59,7 +59,7 @@ char g_str_on_mesh[MENU_DATA_SIZE + 1] = {"1"}; char g_str_stable[MENU_DATA_SIZE + 1] = {"1"}; char g_str_preferred[MENU_DATA_SIZE + 1] = {"1"}; -uint8_t *g_onmesh_ipv6_prefix; +uint8_t g_onmesh_ipv6_prefix[THREAD_IPV6_ADDRESS_SIZE]; uint8_t g_onmesh_ipv6_prefix_len; uint16_t g_onmesh_rloc; uint8_t g_onmesh_preference; @@ -179,7 +179,7 @@ static bool __thread_br_get_onmesh_prefixes_callback(int total, uint8_t *prefix_address = NULL; int ret = thread_onmesh_prefix_get_ipv6_prefix(onmesh_prefix_info, - &g_onmesh_ipv6_prefix, &g_onmesh_ipv6_prefix_len); + g_onmesh_ipv6_prefix, &g_onmesh_ipv6_prefix_len); if (ret == THREAD_ERROR_NONE) { prefix_address = g_onmesh_ipv6_prefix; msg("prefix_address: %02x%02x:%02x%02x:%02x%02x:%02x%02x", diff --git a/tests/unittest/thread-unittest-br.cpp b/tests/unittest/thread-unittest-br.cpp index 30f298a..9026563 100644 --- a/tests/unittest/thread-unittest-br.cpp +++ b/tests/unittest/thread-unittest-br.cpp @@ -356,7 +356,7 @@ TEST_F(ThreadBRTest, BRSetOnmeshIpv6PrefixErrorNone) TEST_F(ThreadBRTest, BRGetOnmeshIpv6PrefixErrorNone) { - uint8_t *ipv6Prefix = NULL; + uint8_t ipv6Prefix[THREAD_IPV6_ADDRESS_SIZE]; uint8_t ipv6PrefixLen; EXPECT_EQ(THREAD_ERROR_NONE, thread_enable(&instance)); @@ -367,8 +367,7 @@ TEST_F(ThreadBRTest, BRGetOnmeshIpv6PrefixErrorNone) onmeshIpv6Prefix, onmeshIpv6PrefixLen)); EXPECT_EQ(THREAD_ERROR_NONE, thread_onmesh_prefix_get_ipv6_prefix(onmeshPrefix, - &ipv6Prefix, &ipv6PrefixLen)); - g_free(ipv6Prefix); + ipv6Prefix, &ipv6PrefixLen)); } TEST_F(ThreadBRTest, BRSetOnmeshPreferenceErrorNone) -- 2.7.4