Remove unused return value

diff --git a/cts-verifier/cts-verifier-publish-test.c b/cts-verifier/cts-verifier-publish-test.c
index 7d63123..87a3566 100644 (file)
--- a/cts-verifier/cts-verifier-publish-test.c
+++ b/cts-verifier/cts-verifier-publish-test.c
@@ -84,13 +84,6 @@ static void __open_cb(wifi_aware_data_path_h data_path, wifi_aware_error_e error
 {
        if (error == WIFI_AWARE_ERROR_NONE) {
                printf("DataPath is confirmed...\n");
-               int ret = WIFI_AWARE_ERROR_NONE;
-               char *interface;
-
-               char *ipv6_address;
-               int port;
-               ret = wifi_aware_data_path_get_peer_ipv6_address(data_path, &ipv6_address);
-               ret = wifi_aware_data_path_get_peer_port(data_path, &port);
                __test_finish(1);
        } else {
                printf("Failed to open Data Path...\n");
@@ -130,7 +123,7 @@ static void __open_data_path(wifi_aware_session_h session)
        case WIFI_AWARE_SECURITY_TYPE_OPEN:
                break;
        case WIFI_AWARE_SECURITY_TYPE_PSK:
-               ret = wifi_aware_data_path_set_psk(g_ndp, PASSPHRASE);
+               wifi_aware_data_path_set_psk(g_ndp, PASSPHRASE);
                break;
        case WIFI_AWARE_SECURITY_TYPE_PMK:
                break;
@@ -243,23 +236,25 @@ static void __enabled_cb(wifi_aware_error_e error, void *user_data)
                printf("Wi-Fi Aware is enabled.\n");
        }
 
-       int ret = wifi_aware_session_create(WIFI_AWARE_SESSION_PUBLISH, &g_wifi_aware_session);
-       ret = wifi_aware_publish_create(&g_publish_handle);
+       wifi_aware_session_create(WIFI_AWARE_SESSION_PUBLISH, &g_wifi_aware_session);
+       wifi_aware_publish_create(&g_publish_handle);
 
        if (__set_publish_config(g_publish_handle) == false) {
                __test_finish(0);
                return;
        }
-       ret = wifi_aware_session_set_message_received_cb(g_wifi_aware_session,
-                       __message_received_cb, NULL);
-       ret = wifi_aware_session_set_terminated_cb(g_wifi_aware_session, __session_terminated_cb, NULL);
-       ret = wifi_aware_session_publish(g_wifi_aware_session, g_publish_handle, __published_cb, NULL);
+       wifi_aware_session_set_message_received_cb(g_wifi_aware_session, __message_received_cb, NULL);
+       wifi_aware_session_set_terminated_cb(g_wifi_aware_session, __session_terminated_cb, NULL);
+       wifi_aware_session_publish(g_wifi_aware_session, g_publish_handle, __published_cb, NULL);
 }
 
 static void run_common()
 {
-       int ret = 0;
-       ret = wifi_aware_enable(__enabled_cb, NULL);
+       int ret = wifi_aware_enable(__enabled_cb, NULL);
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               printf("Wi-Fi Aware is failed\n");
+               __test_finish(0);
+       }
 }
 
 static void clear_resources()
@@ -271,9 +266,9 @@ static void clear_resources()
        g_ndp = NULL;
 
        if (g_wifi_aware_session) {
-               wifi_aware_session_destroy(g_wifi_aware_session);
                wifi_aware_session_unset_message_received_cb(g_wifi_aware_session);
                wifi_aware_session_unset_terminated_cb(g_wifi_aware_session);
+               wifi_aware_session_destroy(g_wifi_aware_session);
        }
        g_wifi_aware_session = NULL;
 

diff --git a/cts-verifier/cts-verifier-subscribe-test.c b/cts-verifier/cts-verifier-subscribe-test.c
index 3d92860..407a3f3 100644 (file)
--- a/cts-verifier/cts-verifier-subscribe-test.c
+++ b/cts-verifier/cts-verifier-subscribe-test.c
@@ -84,19 +84,11 @@ static void __open_cb(wifi_aware_data_path_h data_path, wifi_aware_error_e error
 {
        if (error == WIFI_AWARE_ERROR_NONE) {
                printf("DataPath is confirmed...\n");
-               int ret = WIFI_AWARE_ERROR_NONE;
-               char *interface;
-
-               char *ipv6_address;
-               int port;
-               ret = wifi_aware_data_path_get_peer_ipv6_address(data_path, &ipv6_address);
-               ret = wifi_aware_data_path_get_peer_port(data_path, &port);
                __test_finish(1);
        } else {
                printf("Failed to open Data Path...\n");
                __test_finish(0);
        }
-
 }
 
 static void __open_data_path(wifi_aware_session_h session)
@@ -131,7 +123,7 @@ static void __open_data_path(wifi_aware_session_h session)
        case WIFI_AWARE_SECURITY_TYPE_OPEN:
                break;
        case WIFI_AWARE_SECURITY_TYPE_PSK:
-               ret = wifi_aware_data_path_set_psk(g_ndp, g_psk);
+               wifi_aware_data_path_set_psk(g_ndp, g_psk);
                break;
        case WIFI_AWARE_SECURITY_TYPE_PMK:
                break;
@@ -161,13 +153,10 @@ static void __message_result_cb(wifi_aware_session_h session, wifi_aware_error_e
 static void __message_received_cb(wifi_aware_session_h session, wifi_aware_peer_h peer,
                const unsigned char *message, size_t len, void *user_data)
 {
-       int ret = 0;
-       //char buf[1024] = {0, };
        unsigned char *mac = NULL;
 
        printf("Received message...\n");
 
-       //memcpy(buf, message, 1024);
        printf("Peer's NMI: ");
        wifi_aware_peer_get_mac(peer, &mac);
        if (mac != NULL) {
@@ -190,7 +179,7 @@ static void __service_discovered_cb(wifi_aware_session_h session,
        size_t message_len = strlen(MSG_SUB_TO_PUB);
        memcpy(send_message, MSG_SUB_TO_PUB, message_len);
 
-       int ret = wifi_aware_session_send_message(session,
+       wifi_aware_session_send_message(session,
                        peer, send_message, message_len, __message_result_cb, NULL);
 }
 
@@ -246,27 +235,29 @@ static void __enabled_cb(wifi_aware_error_e error, void *user_data)
                printf("Wi-Fi Aware is enabled.\n");
        }
 
-       int ret = wifi_aware_session_create(WIFI_AWARE_SESSION_SUBSCRIBE, &g_wifi_aware_session);
-
-       ret = wifi_aware_subscribe_create(&g_subscribe_handle);
+       wifi_aware_session_create(WIFI_AWARE_SESSION_SUBSCRIBE, &g_wifi_aware_session);
 
+       wifi_aware_subscribe_create(&g_subscribe_handle);
        if (__set_subscribe_config(g_subscribe_handle) == false) {
                __test_finish(0);
                return;
        }
 
-       ret = wifi_aware_session_set_service_discovered_cb(g_wifi_aware_session,
+       wifi_aware_session_set_service_discovered_cb(g_wifi_aware_session,
                        __service_discovered_cb, NULL);
-       ret = wifi_aware_session_set_message_received_cb(g_wifi_aware_session,
+       wifi_aware_session_set_message_received_cb(g_wifi_aware_session,
                        __message_received_cb, NULL);
-       ret = wifi_aware_session_set_terminated_cb(g_wifi_aware_session, __session_terminated_cb, NULL);
-       ret = wifi_aware_session_subscribe(g_wifi_aware_session, g_subscribe_handle, __subscribed_cb, NULL);
+       wifi_aware_session_set_terminated_cb(g_wifi_aware_session, __session_terminated_cb, NULL);
+       wifi_aware_session_subscribe(g_wifi_aware_session, g_subscribe_handle, __subscribed_cb, NULL);
 }
 
 static void run_common()
 {
-       int ret = 0;
-       ret = wifi_aware_enable(__enabled_cb, NULL);
+       int ret = wifi_aware_enable(__enabled_cb, NULL);
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               printf("Wi-Fi Aware is failed.\n");
+               __test_finish(0);
+       }
 }
 
 static void clear_resources()