Fix incorrect error handling

Change-Id: I3cd99642894c87ac3644ee76b95c509381907a30
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/src/wifi_internal.c b/src/wifi_internal.c
index 8016431014675e73039250e72f6debe612e4e52a..d5c6f2cc350a17ae3529fee4c4ee71455d6c84d8 100644 (file)
--- a/src/wifi_internal.c
+++ b/src/wifi_internal.c
@@ -2142,9 +2142,9 @@ int _wifi_get_hidden_aps(wifi_manager_h wifi, const char *essid,
        GSList *list;
 
        rv = __update_profile_iterator(wifi_handle);
-       if (rv == NET_ERR_ACCESS_DENIED) {
+       if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
        if ((int)g_slist_length(wifi_handle->profile_iterator) == 0) {
@@ -2666,9 +2666,9 @@ int _wifi_foreach_available_interface(wifi_manager_h wifi,
        wifi_manager_handle_s *wifi_handle = wifi;
 
        rv = __update_interface_iterator(wifi_handle);
-       if (rv == NET_ERR_ACCESS_DENIED) {
+       if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
        if ((int)g_slist_length(wifi_handle->interface_iterator) == 0) {
@@ -2694,9 +2694,9 @@ int _wifi_foreach_found_ap(wifi_manager_h wifi,
        wifi_manager_handle_s *wifi_handle = wifi;
 
        rv = __update_profile_iterator(wifi_handle);
-       if (rv == NET_ERR_ACCESS_DENIED) {
+       if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
        if ((int)g_slist_length(wifi_handle->profile_iterator) == 0) {
@@ -2727,9 +2727,9 @@ int _wifi_foreach_found_ap_in_all_interfaces(wifi_manager_h wifi,
        wifi_manager_handle_s *wifi_handle = wifi;
 
        rv = __update_profile_iterator(wifi_handle);
-       if (rv == NET_ERR_ACCESS_DENIED) {
+       if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
        if ((int)g_slist_length(wifi_handle->profile_iterator) == 0) {
@@ -2761,9 +2761,9 @@ int _wifi_foreach_found_specific_ap(wifi_manager_h wifi,
                WIFI_LOG(WIFI_WARN, "There is no specific APs");
 
                rv = __update_profile_iterator(wifi_handle);
-               if (rv == NET_ERR_ACCESS_DENIED) {
+               if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                        WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-                       return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+                       return rv; //LCOV_EXCL_LINE
                }
 
                if ((int)g_slist_length(wifi_handle->profile_iterator) == 0) {
@@ -2866,10 +2866,7 @@ int _wifi_close_profile(wifi_manager_h wifi, wifi_manager_ap_h ap_h,
        wifi_manager_handle_s *wifi_handle = wifi;
 
        rv = net_close_connection(wifi_handle->network_info, ap_info->ProfileName);
-       if (rv == NET_ERR_ACCESS_DENIED) {
-               WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-       } else if (rv != NET_ERR_NONE) {
+       if (rv != NET_ERR_NONE) {
                return WIFI_MANAGER_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
@@ -2963,12 +2960,8 @@ int _wifi_forget_ap_async(wifi_manager_h wifi, wifi_manager_ap_h ap,
        }
 
        rv = net_delete_profile_async(wifi_handle->network_info, ap_info->ProfileName);
-       if (rv == NET_ERR_ACCESS_DENIED) {
-               WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
-       } else if (rv != NET_ERR_NONE) {
+       if (rv != NET_ERR_NONE)
                return WIFI_MANAGER_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
-       }
 
        ap_info->Favourite = (char)FALSE;
        __set_forget_ap_cb(wifi_handle, callback, user_data);
@@ -3346,9 +3339,9 @@ int _wifi_remove_configuration(wifi_manager_h wifi, const gchar *config_id)
                return WIFI_MANAGER_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
 
        rv = __update_profile_iterator(wifi_handle);
-       if (rv == NET_ERR_ACCESS_DENIED) {
+       if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied"); //LCOV_EXCL_LINE
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED; //LCOV_EXCL_LINE
+               return rv; //LCOV_EXCL_LINE
        }
 
        if ((int)g_slist_length(wifi_handle->profile_iterator) == 0) {
@@ -3897,9 +3890,9 @@ int _wifi_get_connection_mode(wifi_manager_h wifi, wifi_manager_connection_mode_
        net_profile_info_s *prof_info = NULL;
 
        rv = __update_profile_iterator(wifi_handle);
-       if (rv == NET_ERR_ACCESS_DENIED) {
+       if (rv == WIFI_MANAGER_ERROR_PERMISSION_DENIED) {
                WIFI_LOG(WIFI_ERROR, "Access denied");
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED;
+               return rv;
        }
 
        for (list = wifi_handle->profile_iterator; list; list = list->next) {
@@ -4333,12 +4326,7 @@ int _wifi_set_power_save_mode(wifi_manager_h wifi, wifi_manager_power_save_mode_
        wifi_manager_handle_s *wifi_handle = wifi;
 
        rv = net_wifi_set_power_save_mode(wifi_handle->network_info, ps_mode);
-       if (rv == NET_ERR_ACCESS_DENIED) {
-               WIFI_LOG(WIFI_ERROR, "Access denied");
-               return WIFI_MANAGER_ERROR_PERMISSION_DENIED;
-       } else if (rv == NET_ERR_INVALID_OPERATION) {
-               return WIFI_MANAGER_ERROR_INVALID_OPERATION;
-       } else if (rv != NET_ERR_NONE) {
+       if (rv != NET_ERR_NONE) {
                WIFI_LOG(WIFI_ERROR, "Failed to get power-save mode");
                return WIFI_MANAGER_ERROR_OPERATION_FAILED;
        }