From 1cd089ee09ae99b0d576d934e20d8d8bd8dedbda Mon Sep 17 00:00:00 2001 From: Cheoleun Moon Date: Thu, 13 Feb 2020 16:03:46 +0900 Subject: [PATCH] Remove unnecessary variables --- test/wifi-aware-test.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c index f51c2e3..380dd13 100644 --- a/test/wifi-aware-test.c +++ b/test/wifi-aware-test.c @@ -237,7 +237,7 @@ const char *__print_error(wifi_aware_error_e err) } } -static inline void __print_result(int ret, gchar *function_name) +static void __print_result(int ret, gchar *function_name) { if (ret == WIFI_AWARE_ERROR_NONE) { printf(MAKE_GREEN"%s"RESET_COLOR"\n", function_name); @@ -339,7 +339,7 @@ static void __published_cb(wifi_aware_error_e error, wifi_aware_publish_h publis if (error == WIFI_AWARE_ERROR_NONE) printf("Publish Request is success. Publish ID: [*]\n"); else - printf("Subscribe Request fails. Error: %s\n", __print_error(error)); + printf("Publish Request fails. Error: %s\n", __print_error(error)); } static void __print_match_filter(unsigned char filter[MAX_MATCH_FILTER_LEN + 1], int filter_len) @@ -437,18 +437,16 @@ static void __set_publish_config(wifi_aware_publish_h publish) void test_publish() { int ret = 0; - wifi_aware_publish_h publish = NULL; RET_IF_LOOP_IS_NULL(); RET_IF_HANDLE_IS_NULL(); - ret = wifi_aware_publish_create(g_wifi_aware_handle, &publish); + ret = wifi_aware_publish_create(g_wifi_aware_handle, &g_publish_handle); __print_result(ret, "wifi_aware_publish_create"); - __set_publish_config(publish); + __set_publish_config(g_publish_handle); - g_publish_handle = publish; - ret = wifi_aware_start_publish(publish, __published_cb, NULL); + ret = wifi_aware_start_publish(g_publish_handle, __published_cb, NULL); __print_result(ret, "wifi_aware_publish"); //ret = wifi_aware_publish_destroy(publish); @@ -572,23 +570,22 @@ static void __set_subscribe_config(wifi_aware_subscribe_h subscribe) void test_subscribe() { int ret = 0; - wifi_aware_subscribe_h subscribe = NULL; RET_IF_LOOP_IS_NULL(); RET_IF_HANDLE_IS_NULL(); + ret = wifi_aware_subscribe_create(g_wifi_aware_handle, &g_subscribe_handle); + __print_result(ret, "wifi_aware_subscribe_create"); + ret = wifi_aware_set_discovery_result_cb(g_subscribe_handle, __discovery_result_cb, NULL); __print_result(ret, "wifi_aware_set_discovery_result_cb"); - ret = wifi_aware_subscribe_create(g_wifi_aware_handle, &subscribe); - __print_result(ret, "wifi_aware_subscribe_create"); - - __set_subscribe_config(subscribe); + __set_subscribe_config(g_subscribe_handle); - ret = wifi_aware_start_subscribe(subscribe, __subscribed_cb, NULL); + ret = wifi_aware_start_subscribe(g_subscribe_handle, __subscribed_cb, NULL); __print_result(ret, "wifi_aware_subscribe"); - ret = wifi_aware_subscribe_destroy(subscribe); + ret = wifi_aware_subscribe_destroy(g_subscribe_handle); __print_result(ret, "wifi_aware_subscribe_destroy"); } -- 2.7.4