Added __NETWORK_CAPI_FUNC_EXIT__

Change-Id: I4dec1b8bf5239ed25db4bcea135e0def3a2ec4b5
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>

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

diff --git a/src/wifi_ap.c b/src/wifi_ap.c
index 21348ab4142037c745f8aa9fa36e35f828a1f6c8..c2282ab35aeab055c748aedc83d2eed6ebb26379 100755 (executable)
--- a/src/wifi_ap.c
+++ b/src/wifi_ap.c
@@ -251,7 +251,7 @@ EXPORT_API int wifi_manager_ap_create(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (essid == NULL || ap == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -282,7 +282,7 @@ EXPORT_API int wifi_manager_ap_hidden_create(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        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 3d430c9e659b2f57ef00b6058e9ecc878f0b342b..2d3884c5a5295fb1b2017dc892d3a0599939a8a0 100755 (executable)
--- a/src/wifi_config.c
+++ b/src/wifi_config.c
@@ -30,7 +30,7 @@ EXPORT_API int wifi_manager_config_create(wifi_manager_h wifi, const char *name,
 
        wifi_config_s *h = NULL;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        h = g_new0(wifi_config_s, 1);
        if (h == NULL) {
@@ -179,7 +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;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (_wifi_check_config_validity(config) == false || h->name == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -214,7 +214,7 @@ 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;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (config == NULL || h->name == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -254,7 +254,7 @@ EXPORT_API int wifi_manager_config_foreach_configuration(wifi_manager_h wifi,
 
        int ret = WIFI_MANAGER_ERROR_NONE;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE

diff --git a/src/wifi_manager.c b/src/wifi_manager.c
index ba8defa2b4333c297f33c0050f14efc6f9d68bab..2ede435658442b20485d3c583cb3dee0ef5a66ef 100755 (executable)
--- a/src/wifi_manager.c
+++ b/src/wifi_manager.c
@@ -220,7 +220,7 @@ EXPORT_API int wifi_manager_deinitialize(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        wifi_manager_unset_rssi_level_changed_cb(wifi);
 
@@ -281,7 +281,7 @@ EXPORT_API int wifi_manager_activate(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_activate(wifi, callback, FALSE, user_data);
        if (rv != WIFI_MANAGER_ERROR_NONE)
@@ -300,7 +300,7 @@ EXPORT_API int wifi_manager_activate_with_wifi_picker_tested(
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -324,7 +324,7 @@ EXPORT_API int wifi_manager_deactivate(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_deactivate(wifi, callback, user_data);
        if (rv != WIFI_MANAGER_ERROR_NONE)
@@ -343,7 +343,7 @@ EXPORT_API int wifi_manager_is_activated(wifi_manager_h wifi, bool *activated)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (activated == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -369,7 +369,7 @@ EXPORT_API int wifi_manager_get_mac_address(wifi_manager_h wifi, char **mac_addr
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (mac_address == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -441,7 +441,7 @@ EXPORT_API int wifi_manager_get_network_interface_name(wifi_manager_h wifi, char
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (name == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -462,7 +462,7 @@ EXPORT_API int wifi_manager_scan(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -487,7 +487,7 @@ EXPORT_API int wifi_manager_get_scan_state(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (scan_state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -515,7 +515,7 @@ EXPORT_API int wifi_manager_scan_specific_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (essid == NULL || callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -540,7 +540,7 @@ EXPORT_API int wifi_manager_connect_hidden_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter(1)"); //LCOV_EXCL_LINE
@@ -567,7 +567,7 @@ EXPORT_API int wifi_manager_get_connected_ap(wifi_manager_h wifi, wifi_manager_a
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (ap == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -589,7 +589,7 @@ EXPORT_API int wifi_manager_foreach_found_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -608,7 +608,7 @@ EXPORT_API int wifi_manager_foreach_found_specific_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -629,7 +629,7 @@ EXPORT_API int wifi_manager_foreach_found_bssid_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -655,7 +655,7 @@ EXPORT_API int wifi_manager_foreach_found_netlink_scan_ap(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -674,7 +674,7 @@ EXPORT_API int wifi_manager_connect(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -699,7 +699,7 @@ EXPORT_API int wifi_manager_disconnect(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -725,7 +725,7 @@ EXPORT_API int wifi_manager_connect_by_wps_pbc(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -750,7 +750,7 @@ EXPORT_API int wifi_manager_connect_by_wps_pin(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -781,7 +781,7 @@ EXPORT_API int wifi_manager_forget_ap(wifi_manager_h wifi, wifi_manager_ap_h ap)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (_wifi_check_ap_validity(ap) == false) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -802,7 +802,7 @@ EXPORT_API int wifi_manager_forget_ap_async(wifi_manager_h wifi, wifi_manager_ap
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (_wifi_check_ap_validity(ap) == false) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -820,7 +820,7 @@ EXPORT_API int wifi_manager_update_ap(wifi_manager_h wifi, wifi_manager_ap_h ap)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (_wifi_check_ap_validity(ap) == false) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -846,7 +846,7 @@ EXPORT_API int wifi_manager_get_connection_state(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (connection_state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -865,7 +865,7 @@ EXPORT_API int wifi_manager_set_device_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -883,7 +883,7 @@ EXPORT_API int wifi_manager_unset_device_state_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_device_state_changed_cb(wifi, NULL, NULL);
@@ -896,7 +896,7 @@ EXPORT_API int wifi_manager_set_background_scan_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -914,7 +914,7 @@ EXPORT_API int wifi_manager_unset_background_scan_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_background_scan_cb(wifi, NULL, NULL);
@@ -927,7 +927,7 @@ EXPORT_API int wifi_manager_set_scan_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -945,7 +945,7 @@ EXPORT_API int wifi_manager_unset_scan_state_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_scan_state_changed_cb(wifi, NULL, NULL);
@@ -958,7 +958,7 @@ EXPORT_API int wifi_manager_set_connection_state_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -976,7 +976,7 @@ EXPORT_API int wifi_manager_unset_connection_state_changed_cb(wifi_manager_h wif
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_connection_state_changed_cb(wifi, NULL, NULL);
@@ -987,7 +987,7 @@ EXPORT_API int wifi_manager_set_ip_conflict_cb(wifi_manager_h wifi,
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1001,7 +1001,7 @@ EXPORT_API int wifi_manager_unset_ip_conflict_cb(wifi_manager_h wifi)
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
        return __wifi_set_ip_conflict_cb(wifi, NULL, NULL);
 }
 
@@ -1012,7 +1012,7 @@ EXPORT_API int wifi_manager_set_ip_conflict_detect_enable(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
        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
@@ -1024,7 +1024,7 @@ EXPORT_API int wifi_manager_ip_conflict_detect_is_enabled(wifi_manager_h wifi, b
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1040,7 +1040,7 @@ EXPORT_API int wifi_manager_set_ip_conflict_period(wifi_manager_h wifi,
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
        return _wifi_set_ip_conflict_period(initial_time);
 }
 
@@ -1049,7 +1049,7 @@ EXPORT_API int wifi_manager_get_ip_conflict_period(wifi_manager_h wifi,
 
 {
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (initial_time == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1064,7 +1064,7 @@ 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);
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1081,7 +1081,7 @@ EXPORT_API int wifi_manager_set_rssi_level_changed_cb(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1099,7 +1099,7 @@ EXPORT_API int wifi_manager_unset_rssi_level_changed_cb(wifi_manager_h wifi)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_rssi_level_changed_cb(wifi, NULL, NULL);
@@ -1114,7 +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");
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) { //LCOV_EXCL_LINE
                WIFI_LOG(WIFI_ERROR, "[App<--TizenMW] Wrong Parameter Passed\n"); //LCOV_EXCL_LINE
@@ -1135,7 +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");
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) { //LCOV_EXCL_LINE
                WIFI_LOG(WIFI_ERROR, "[App<--TizenMW] Wrong Parameter Passed\n"); //LCOV_EXCL_LINE
@@ -1163,7 +1163,7 @@ EXPORT_API int wifi_manager_cancel_wps(wifi_manager_h wifi)
 
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_cancel_wps();
 
@@ -1179,7 +1179,7 @@ EXPORT_API int wifi_manager_get_wps_generated_pin(wifi_manager_h wifi, char **wp
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
        rv = _wifi_get_wps_generated_pin(wps_pin);
        if (rv == NET_ERR_ACCESS_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
@@ -1201,7 +1201,7 @@ EXPORT_API int wifi_manager_set_autoscan(wifi_manager_h wifi, bool autoscan)
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return _wifi_set_autoscan(autoscan);
@@ -1215,7 +1215,7 @@ EXPORT_API int wifi_manager_set_autoscan_mode(wifi_manager_h wifi, wifi_manager_
 
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
 
        if (mode < WIFI_MANAGER_AUTOSCAN_MODE_EXPONENTIAL || mode > WIFI_MANAGER_AUTOSCAN_MODE_PERIODIC) {
@@ -1239,7 +1239,7 @@ EXPORT_API int wifi_manager_get_autoscan(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (autoscan == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1258,7 +1258,7 @@ EXPORT_API int wifi_manager_get_autoscan_mode(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (mode == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1278,7 +1278,7 @@ EXPORT_API int wifi_manager_set_passpoint(wifi_manager_h wifi, int passpoint)
 
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_set_passpoint(passpoint);
 
@@ -1294,7 +1294,7 @@ EXPORT_API int wifi_manager_get_passpoint(wifi_manager_h wifi, int *passpoint)
 
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (passpoint == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1321,7 +1321,7 @@ EXPORT_API int wifi_manager_set_module_state_changed_cb(wifi_manager_h wifi,
                return WIFI_MANAGER_ERROR_NOT_SUPPORTED;
        }
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1345,7 +1345,7 @@ EXPORT_API int wifi_manager_unset_module_state_changed_cb(wifi_manager_h wifi)
                return WIFI_MANAGER_ERROR_NOT_SUPPORTED;
        }
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
        return __wifi_set_module_state_changed_cb(wifi, NULL, NULL);
@@ -1363,7 +1363,7 @@ EXPORT_API int wifi_manager_get_module_state(wifi_manager_h wifi,
                return WIFI_MANAGER_ERROR_NOT_SUPPORTED;
        }
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (state == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1383,7 +1383,7 @@ EXPORT_API int wifi_manager_bssid_scan(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1404,7 +1404,7 @@ 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);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1425,7 +1425,7 @@ EXPORT_API int wifi_manager_add_vsie(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (vsie_str == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1452,7 +1452,7 @@ EXPORT_API int wifi_manager_get_vsie(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (vsie_str == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1471,7 +1471,7 @@ EXPORT_API int wifi_manager_remove_vsie(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (vsie_str == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -1492,7 +1492,7 @@ EXPORT_API int wifi_manager_flush_bss(wifi_manager_h wifi)
 
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_flush_bss();
 
@@ -1519,7 +1519,7 @@ EXPORT_API int wifi_manager_set_bssid(wifi_manager_h wifi, char *bssid)
                return WIFI_MANAGER_ERROR_INVALID_PARAMETER;
        }
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_set_bssid(bssid);
 
@@ -1544,7 +1544,7 @@ EXPORT_API int wifi_manager_get_auto_connect(wifi_manager_h wifi, int *connect_m
 
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_get_auto_connect(connect_mode);
 
@@ -1601,7 +1601,7 @@ EXPORT_API int wifi_manager_netlink_scan_create(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_netlink_scan_create(netlink_scan);
        if (rv != WIFI_MANAGER_ERROR_NONE) {
@@ -1623,7 +1623,7 @@ EXPORT_API int wifi_manager_netlink_scan_destroy(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        _wifi_remove_from_netlink_scan_list(netlink_scan);
 
@@ -1688,7 +1688,7 @@ EXPORT_API int wifi_manager_specific_scan_create(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        int rv;
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        rv = _wifi_specific_scan_create(specific_scan);
        if (rv != WIFI_MANAGER_ERROR_NONE) {
@@ -1710,7 +1710,7 @@ EXPORT_API int wifi_manager_specific_scan_destroy(wifi_manager_h wifi,
 
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (!(_wifi_check_multi_scan_validity(specific_scan))) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE
@@ -1768,7 +1768,7 @@ 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);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (!(_wifi_check_multi_scan_validity(specific_scan)) || callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter"); //LCOV_EXCL_LINE

diff --git a/src/wifi_tdls.c b/src/wifi_tdls.c
index 8dc14639bdc665c78e5cab8aa2d429b74b017ec8..b806dfbaa84a01b12d425616535a966a067ece0e 100755 (executable)
--- a/src/wifi_tdls.c
+++ b/src/wifi_tdls.c
@@ -53,7 +53,7 @@ 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");
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -74,7 +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");
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
 
@@ -89,7 +89,7 @@ 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");
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -126,7 +126,7 @@ 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");
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
        if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
                __NETWORK_CAPI_FUNC_EXIT__;
@@ -157,7 +157,7 @@ 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);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -186,7 +186,7 @@ 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);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -222,7 +222,7 @@ 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);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (callback == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -242,7 +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);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        __NETWORK_CAPI_FUNC_EXIT__;
 
@@ -257,7 +257,7 @@ EXPORT_API int wifi_manager_tdls_enable_channel_switching(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (peer_mac_addr == NULL || freq < 0) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");
@@ -287,7 +287,7 @@ EXPORT_API int wifi_manager_tdls_disable_channel_switching(wifi_manager_h wifi,
        CHECK_FEATURE_SUPPORTED(WIFI_FEATURE);
        CHECK_FEATURE_SUPPORTED(WIFI_TDLS_FEATURE);
 
-       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi);
+       RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi, __NETWORK_CAPI_FUNC_EXIT__);
 
        if (peer_mac_addr == NULL) {
                WIFI_LOG(WIFI_ERROR, "Invalid parameter");