Check wifi_manager_h handle validity

Description: Check the wifi_manager_h handle
in each API and return the appropriate error
in case of failure.

Signed-off-by: Abhishek Sansanwal <abhishek.s94@samsung.com>
Change-Id: Ie40f8b521183b7c394397c4555a4a512b885a268

diff --git a/include/wifi_internal.h b/include/wifi_internal.h
index 5358371d56da58e874589ff0061c1d4799ba03e0..53d36fbeb86486d0815c417cdd83fc12f4262786 100755 (executable)
--- a/include/wifi_internal.h
+++ b/include/wifi_internal.h
@@ -86,6 +86,18 @@ typedef enum {
                } \
        } while (0)
 
+#define RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(arg)\
+       do {\
+               if (!arg) {\
+                       WIFI_LOG(WIFI_ERROR, "Wifi handle is null");\
+                       return WIFI_MANAGER_ERROR_INVALID_PARAMETER;\
+               }\
+               if (!__wifi_check_handle_validity(arg)) {\
+                       WIFI_LOG(WIFI_ERROR, "Wifi handle is not initialized");\
+                       return WIFI_MANAGER_NOT_INITIALIZED;\
+               }\
+       } while(0)
+
 typedef enum {
        WIFI_DEVICE_STATE_CB,
        WIFI_BG_SCAN_CB,

diff --git a/src/wifi_ap.c b/src/wifi_ap.c
index 7aea86fdc293dbc980f5487287ada1d69b67ba9b..21348ab4142037c745f8aa9fa36e35f828a1f6c8 100755 (executable)
--- a/src/wifi_ap.c
+++ b/src/wifi_ap.c
@@ -251,11 +251,7 @@ EXPORT_API int wifi_manager_ap_create(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (essid == NULL || ap == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -286,11 +282,7 @@ EXPORT_API int wifi_manager_ap_hidden_create(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (essid == NULL || ap == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE

diff --git a/src/wifi_config.c b/src/wifi_config.c
index fdf882695f3d52897629d50833afbfb4973c1ca1..3d430c9e659b2f57ef00b6058e9ecc878f0b342b 100755 (executable)
--- a/src/wifi_config.c
+++ b/src/wifi_config.c
@@ -30,12 +30,7 @@ EXPORT_API int wifi_manager_config_create(wifi_manager_h wifi, const char *name,
 
        wifi_config_s *h = NULL;
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-               config == NULL || name == NULL) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        h = g_new0(wifi_config_s, 1);
        if (h == NULL) {
@@ -184,11 +179,7 @@ EXPORT_API int wifi_manager_config_save(wifi_manager_h wifi,
        int ret = WIFI_MANAGER_ERROR_NONE;
        wifi_config_s *h = (wifi_config_s *)config;
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (_wifi_check_config_validity(config) == false || h->name == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -223,8 +214,9 @@ EXPORT_API int wifi_manager_config_remove(wifi_manager_h wifi, wifi_manager_conf
        int ret = WIFI_MANAGER_ERROR_NONE;
        wifi_config_s *h = (wifi_config_s *)config;
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-               config == NULL || h->name == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (config == NULL || h->name == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -262,7 +254,9 @@ EXPORT_API int wifi_manager_config_foreach_configuration(wifi_manager_h wifi,
 
        int ret = WIFI_MANAGER_ERROR_NONE;
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE

diff --git a/src/wifi_manager.c b/src/wifi_manager.c
index 9d34a1b456b57dc8f79452e67a4006f3d096a7e7..ba8defa2b4333c297f33c0050f14efc6f9d68bab 100755 (executable)
--- a/src/wifi_manager.c
+++ b/src/wifi_manager.c
@@ -220,11 +220,7 @@ EXPORT_API int wifi_manager_deinitialize(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        wifi_manager_unset_rssi_level_changed_cb(wifi);
 
@@ -285,11 +281,7 @@ EXPORT_API int wifi_manager_activate(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_activate(wifi, callback, FALSE, user_data);
        if (rv != WIFI_MANAGER_ERROR_NONE)
@@ -308,7 +300,9 @@ EXPORT_API int wifi_manager_activate_with_wifi_picker_tested(
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -330,11 +324,7 @@ EXPORT_API int wifi_manager_deactivate(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_deactivate(wifi, callback, user_data);
        if (rv != WIFI_MANAGER_ERROR_NONE)
@@ -353,7 +343,9 @@ EXPORT_API int wifi_manager_is_activated(wifi_manager_h wifi, bool *activated)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (activated == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (activated == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -377,7 +369,9 @@ EXPORT_API int wifi_manager_get_mac_address(wifi_manager_h wifi, char **mac_addr
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (mac_address == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (mac_address == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -447,7 +441,9 @@ EXPORT_API int wifi_manager_get_network_interface_name(wifi_manager_h wifi, char
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (name == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (name == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -466,7 +462,9 @@ EXPORT_API int wifi_manager_scan(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -489,7 +487,9 @@ EXPORT_API int wifi_manager_get_scan_state(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || scan_state == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (scan_state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -515,8 +515,9 @@ EXPORT_API int wifi_manager_scan_specific_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-               essid == NULL || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (essid == NULL || callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -539,7 +540,9 @@ EXPORT_API int wifi_manager_connect_hidden_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter(1)"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -564,7 +567,9 @@ EXPORT_API int wifi_manager_get_connected_ap(wifi_manager_h wifi, wifi_manager_a
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (ap == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (ap == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -584,7 +589,9 @@ EXPORT_API int wifi_manager_foreach_found_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -601,7 +608,9 @@ EXPORT_API int wifi_manager_foreach_found_specific_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -620,7 +629,9 @@ EXPORT_API int wifi_manager_foreach_found_bssid_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -644,7 +655,9 @@ EXPORT_API int wifi_manager_foreach_found_netlink_scan_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -661,7 +674,9 @@ EXPORT_API int wifi_manager_connect(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -684,7 +699,9 @@ EXPORT_API int wifi_manager_disconnect(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -708,7 +725,9 @@ EXPORT_API int wifi_manager_connect_by_wps_pbc(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -731,7 +750,9 @@ EXPORT_API int wifi_manager_connect_by_wps_pin(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -760,11 +781,7 @@ EXPORT_API int wifi_manager_forget_ap(wifi_manager_h wifi, wifi_manager_ap_h ap)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (_wifi_check_ap_validity(ap) == false) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -785,11 +802,7 @@ EXPORT_API int wifi_manager_forget_ap_async(wifi_manager_h wifi, wifi_manager_ap
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (_wifi_check_ap_validity(ap) == false) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -807,8 +820,9 @@ EXPORT_API int wifi_manager_update_ap(wifi_manager_h wifi, wifi_manager_ap_h ap)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-               (_wifi_check_ap_validity(ap) == false)) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (_wifi_check_ap_validity(ap) == false) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -832,7 +846,9 @@ EXPORT_API int wifi_manager_get_connection_state(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (connection_state == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (connection_state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -849,7 +865,9 @@ EXPORT_API int wifi_manager_set_device_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -865,11 +883,7 @@ EXPORT_API int wifi_manager_unset_device_state_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_device_state_changed_cb(wifi, NULL, NULL);
@@ -882,7 +896,9 @@ EXPORT_API int wifi_manager_set_background_scan_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -898,11 +914,7 @@ EXPORT_API int wifi_manager_unset_background_scan_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_background_scan_cb(wifi, NULL, NULL);
@@ -915,7 +927,9 @@ EXPORT_API int wifi_manager_set_scan_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -931,11 +945,7 @@ EXPORT_API int wifi_manager_unset_scan_state_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_scan_state_changed_cb(wifi, NULL, NULL);
@@ -948,7 +958,9 @@ EXPORT_API int wifi_manager_set_connection_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -964,11 +976,7 @@ EXPORT_API int wifi_manager_unset_connection_state_changed_cb(wifi_manager_h wif
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_connection_state_changed_cb(wifi, NULL, NULL);
@@ -979,7 +987,9 @@ EXPORT_API int wifi_manager_set_ip_conflict_cb(wifi_manager_h wifi,
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
@@ -991,11 +1001,7 @@ EXPORT_API int wifi_manager_unset_ip_conflict_cb(wifi_manager_h wifi)
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
-
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
        return __wifi_set_ip_conflict_cb(wifi, NULL, NULL);
 }
 
@@ -1006,11 +1012,7 @@ EXPORT_API int wifi_manager_set_ip_conflict_detect_enable(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
-
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
        rv = _wifi_ip_conflict_detect_enable_set(detect);
        if (rv != WIFI_MANAGER_ERROR_NONE)
                WIFI_LOG(WIFI_ERROR, "Failed to change ip conflict detect mode"); //LCOV_EXCL_LINE
@@ -1022,7 +1024,9 @@ EXPORT_API int wifi_manager_ip_conflict_detect_is_enabled(wifi_manager_h wifi, b
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (state == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
@@ -1036,11 +1040,7 @@ EXPORT_API int wifi_manager_set_ip_conflict_period(wifi_manager_h wifi,
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
-
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
        return _wifi_set_ip_conflict_period(initial_time);
 }
 
@@ -1049,7 +1049,9 @@ EXPORT_API int wifi_manager_get_ip_conflict_period(wifi_manager_h wifi,
 
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
-       if (initial_time == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (initial_time == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
        }
@@ -1062,7 +1064,9 @@ EXPORT_API int wifi_manager_get_ip_conflict_state(wifi_manager_h wifi,
                wifi_manager_ip_conflict_state_e *state)
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
-       if (state == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
        }
@@ -1077,7 +1081,9 @@ EXPORT_API int wifi_manager_set_rssi_level_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -1093,11 +1099,7 @@ EXPORT_API int wifi_manager_unset_rssi_level_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_rssi_level_changed_cb(wifi, NULL, NULL);
@@ -1112,11 +1114,7 @@ EXPORT_API int wifi_manager_connect_by_wps_pbc_without_ssid(wifi_manager_h wifi,
 
        WIFI_LOG(WIFI_INFO, "[App-->TizenMW] WiFi Connect by WPS_PBC without SSID\n");
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (callback == NULL) { //LCOV_EXCL_LINE
                WIFI_LOG(WIFI_ERROR, "[App<--TizenMW] Wrong Parameter Passed\n"); //LCOV_EXCL_LINE
@@ -1137,11 +1135,7 @@ EXPORT_API int wifi_manager_connect_by_wps_pin_without_ssid(wifi_manager_h wifi,
 
        WIFI_LOG(WIFI_INFO, "[App-->TizenMW] WiFi Connect by WPS_PIN without SSID\n");
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        if (callback == NULL) { //LCOV_EXCL_LINE
                WIFI_LOG(WIFI_ERROR, "[App<--TizenMW] Wrong Parameter Passed\n"); //LCOV_EXCL_LINE
@@ -1169,11 +1163,7 @@ EXPORT_API int wifi_manager_cancel_wps(wifi_manager_h wifi)
 
        int rv;
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_cancel_wps();
 
@@ -1189,11 +1179,7 @@ EXPORT_API int wifi_manager_get_wps_generated_pin(wifi_manager_h wifi, char **wp
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        int rv;
 
-       if (!__wifi_check_handle_validity(wifi)) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
-
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
        rv = _wifi_get_wps_generated_pin(wps_pin);
        if (rv == NET_ERR_ACCESS_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
@@ -1215,11 +1201,7 @@ EXPORT_API int wifi_manager_set_autoscan(wifi_manager_h wifi, bool autoscan)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return _wifi_set_autoscan(autoscan);
@@ -1233,11 +1215,7 @@ EXPORT_API int wifi_manager_set_autoscan_mode(wifi_manager_h wifi, wifi_manager_
 
        int rv;
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
 
        if (mode < WIFI_MANAGER_AUTOSCAN_MODE_EXPONENTIAL || mode > WIFI_MANAGER_AUTOSCAN_MODE_PERIODIC) {
@@ -1261,7 +1239,9 @@ EXPORT_API int wifi_manager_get_autoscan(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (autoscan == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (autoscan == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -1278,7 +1258,9 @@ EXPORT_API int wifi_manager_get_autoscan_mode(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (mode == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (mode == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -1296,11 +1278,7 @@ EXPORT_API int wifi_manager_set_passpoint(wifi_manager_h wifi, int passpoint)
 
        int rv;
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               __NETWORK_CAPI_FUNC_EXIT__;
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_set_passpoint(passpoint);
 
@@ -1316,7 +1294,9 @@ EXPORT_API int wifi_manager_get_passpoint(wifi_manager_h wifi, int *passpoint)
 
        int rv;
 
-       if (!(__wifi_check_handle_validity(wifi)) || passpoint == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (passpoint == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1336,7 +1316,14 @@ EXPORT_API int wifi_manager_set_module_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       if (_get_tizen_profile() != TIZEN_PROFILE_TV) {
+               __NETWORK_CAPI_FUNC_EXIT__;
+               return WIFI_MANAGER_ERROR_NOT_SUPPORTED;
+       }
+
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -1353,12 +1340,13 @@ EXPORT_API int wifi_manager_unset_module_state_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
+       if (_get_tizen_profile() != TIZEN_PROFILE_TV) {
+               __NETWORK_CAPI_FUNC_EXIT__;
+               return WIFI_MANAGER_ERROR_NOT_SUPPORTED;
        }
 
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_module_state_changed_cb(wifi, NULL, NULL);
 }
@@ -1370,7 +1358,14 @@ EXPORT_API int wifi_manager_get_module_state(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (state == NULL || !(__wifi_check_handle_validity(wifi))) {
+       if (_get_tizen_profile() != TIZEN_PROFILE_TV) {
+               __NETWORK_CAPI_FUNC_EXIT__;
+               return WIFI_MANAGER_ERROR_NOT_SUPPORTED;
+       }
+
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -1388,7 +1383,9 @@ EXPORT_API int wifi_manager_bssid_scan(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1407,8 +1404,9 @@ EXPORT_API int wifi_manager_netlink_scan(wifi_manager_h wifi, wifi_manager_netli
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        WIFI_LOG(WIFI_INFO, "netlink scan handle %p", netlink_scan);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi)) ||
-                       !_wifi_check_netlink_scan_validity(netlink_scan)) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1427,7 +1425,9 @@ EXPORT_API int wifi_manager_add_vsie(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (vsie_str == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (vsie_str == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1452,7 +1452,9 @@ EXPORT_API int wifi_manager_get_vsie(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (vsie_str == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (vsie_str == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1469,7 +1471,9 @@ EXPORT_API int wifi_manager_remove_vsie(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (vsie_str == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (vsie_str == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -1488,11 +1492,7 @@ EXPORT_API int wifi_manager_flush_bss(wifi_manager_h wifi)
 
        int rv;
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               __NETWORK_CAPI_FUNC_EXIT__;
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_flush_bss();
 
@@ -1519,11 +1519,7 @@ EXPORT_API int wifi_manager_set_bssid(wifi_manager_h wifi, char *bssid)
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
        }
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               __NETWORK_CAPI_FUNC_EXIT__;
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_set_bssid(bssid);
 
@@ -1548,11 +1544,7 @@ EXPORT_API int wifi_manager_get_auto_connect(wifi_manager_h wifi, int *connect_m
 
        int rv;
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               __NETWORK_CAPI_FUNC_EXIT__;
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_get_auto_connect(connect_mode);
 
@@ -1609,11 +1601,7 @@ EXPORT_API int wifi_manager_netlink_scan_create(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        int rv;
 
-       if (!__wifi_check_handle_validity(wifi)) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_netlink_scan_create(netlink_scan);
        if (rv != WIFI_MANAGER_ERROR_NONE) {
@@ -1635,12 +1623,7 @@ EXPORT_API int wifi_manager_netlink_scan_destroy(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-                       !(_wifi_check_netlink_scan_validity(netlink_scan))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        _wifi_remove_from_netlink_scan_list(netlink_scan);
 
@@ -1705,11 +1688,7 @@ EXPORT_API int wifi_manager_specific_scan_create(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        int rv;
 
-       if (!__wifi_check_handle_validity(wifi)) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
-               __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        rv = _wifi_specific_scan_create(specific_scan);
        if (rv != WIFI_MANAGER_ERROR_NONE) {
@@ -1731,8 +1710,9 @@ EXPORT_API int wifi_manager_specific_scan_destroy(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-                       !(_wifi_check_multi_scan_validity(specific_scan))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (!(_wifi_check_multi_scan_validity(specific_scan))) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE
@@ -1788,8 +1768,9 @@ EXPORT_API int wifi_manager_specific_ap_start_multi_scan(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        WIFI_LOG(WIFI_ERROR, "specific scan handle %p", specific_scan);
 
-       if (!(__wifi_check_handle_validity(wifi)) ||
-               !(_wifi_check_multi_scan_validity(specific_scan)) || callback == NULL) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (!(_wifi_check_multi_scan_validity(specific_scan)) || callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
                __NETWORK_CAPI_FUNC_EXIT__; //LCOV_EXCL_LINE
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE

diff --git a/src/wifi_tdls.c b/src/wifi_tdls.c
index 1a4af8496e51937b8e70f5816c61be1bd6c1552b..8dc14639bdc665c78e5cab8aa2d429b74b017ec8 100755 (executable)
--- a/src/wifi_tdls.c
+++ b/src/wifi_tdls.c
@@ -53,7 +53,9 @@ EXPORT_API int wifi_manager_tdls_set_discovered_cb(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
        WIFI_LOG(WIFI_INFO, "[App-->TizenMW] Set TLDS discover Callback\n");
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -72,11 +74,7 @@ EXPORT_API int wifi_manager_tdls_unset_discovered_cb(wifi_manager_h wifi)
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
        WIFI_LOG(WIFI_INFO, "[App-->TizenMW] Unset TDLS discover Callback\n");
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               __NETWORK_CAPI_FUNC_EXIT__;
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
 
@@ -91,7 +89,9 @@ EXPORT_API int wifi_manager_tdls_start_discovery(wifi_manager_h wifi, const char
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
        WIFI_LOG(WIFI_INFO, "WiFi TDLS Discover Request");
 
-       if (peer_mac_addr == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -126,7 +126,8 @@ EXPORT_API int wifi_manager_tdls_connect(wifi_manager_h wifi, const char* peer_m
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
        WIFI_LOG(WIFI_INFO, "[App-->TizenMW] WiFi TDLS Connect Request");
 
-       if (peer_mac_addr == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -156,7 +157,9 @@ EXPORT_API int wifi_manager_tdls_disconnect(wifi_manager_h wifi, const char *pee
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       if (peer_mac_addr == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -183,7 +186,9 @@ EXPORT_API int wifi_manager_tdls_get_connected_peer(wifi_manager_h wifi, char **
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       if (peer_mac_addr == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -217,7 +222,9 @@ EXPORT_API int wifi_manager_tdls_set_state_changed_cb(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       if (callback == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -235,11 +242,7 @@ EXPORT_API int wifi_manager_tdls_unset_state_changed_cb(wifi_manager_h wifi)
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       if (!(__wifi_check_handle_validity(wifi))) {
-               WIFI_LOG(WIFI_ERROR, "Invalid parameter");
-               __NETWORK_CAPI_FUNC_EXIT__;
-               return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
-       }
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
 
        __NETWORK_CAPI_FUNC_EXIT__;
 
@@ -254,8 +257,9 @@ EXPORT_API int wifi_manager_tdls_enable_channel_switching(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       if (peer_mac_addr == NULL || !(__wifi_check_handle_validity(wifi))
-               || freq < 0) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (peer_mac_addr == NULL || freq < 0) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
@@ -283,7 +287,9 @@ EXPORT_API int wifi_manager_tdls_disable_channel_switching(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       if (peer_mac_addr == NULL || !(__wifi_check_handle_validity(wifi))) {
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+
+       if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;