Fix UNREACHABLE_CODE issue

Change-Id: I408298c7944da18c30eff4afb43d93611332ed37
Signed-off-by: anujk-singh <anujk.singh@samsung.com>

diff --git a/ua-daemon/src/pm/ua-vendor-plugin-handler.c b/ua-daemon/src/pm/ua-vendor-plugin-handler.c
index a8d386538af59f207dc75c2141483bcb77e2c0ec..f708f732f3907950bdf96a6dac2bcbacc548ca3e 100644 (file)
--- a/ua-daemon/src/pm/ua-vendor-plugin-handler.c
+++ b/ua-daemon/src/pm/ua-vendor-plugin-handler.c
@@ -108,13 +108,9 @@ static unsigned int get_active_sensors_callback(void)
 static void set_lpm(int mode)
 {
        FUNC_ENTRY;
-       int ret;
 
        UAM_INFO("lpm_mode = %s", ((mode != 0) ? "TRUE" : "FALSE"));
-       ret = _uam_pm_set_low_power_mode(UAM_SENSOR_ALL, (mode == 0) ? FALSE : TRUE);
-       if (UAM_ERROR_NONE != ret)
-               UAM_ERR("Failed with error: %s (0x%4.4X)",
-                               _uam_manager_error_to_str(ret), ret);
+       _uam_pm_set_low_power_mode(UAM_SENSOR_ALL, (mode == 0) ? FALSE : TRUE);
 
        FUNC_EXIT;
 }

diff --git a/ua-daemon/src/ua-manager-core.c b/ua-daemon/src/ua-manager-core.c
index 348d527748af1d0504e736761c3d7488bdb7ee1d..94093f6480821f1067b1fa4aef4ab021ab835dc7 100755 (executable)
--- a/ua-daemon/src/ua-manager-core.c
+++ b/ua-daemon/src/ua-manager-core.c
@@ -921,8 +921,7 @@ static int __remove_uam_db_user_info(gpointer data)
        bitmask = _uam_core_get_user_sensors();
 
        /* Set/update registered device list to plugins */
-       if (UAM_ERROR_NONE != _uam_pm_set_registered_devices(devices, bitmask))
-               UAM_ERR("_uam_pm_set_registered_devices failed");
+       _uam_pm_set_registered_devices(devices, bitmask);
 
        /* Set/update registered device list to cloud plugin */
        _uam_cloud_update_registered_devices();
@@ -1731,8 +1730,7 @@ static int __uam_remove_device(int user_id, uam_db_device_info_t *device,
 
 
        /* Set/update registered device list to plugins */
-       if (UAM_ERROR_NONE != _uam_pm_set_registered_devices(devices, bitmask))
-               UAM_ERR("_uam_pm_set_registered_devices failed");
+       _uam_pm_set_registered_devices(devices, bitmask);
 
        /* Set/update registered device list to cloud plugin */
        _uam_cloud_update_registered_devices();
@@ -2581,7 +2579,6 @@ int _uam_core_service_remove_device(const char *svc_name,
        GSList *l;
        char *mac;
        uam_db_tech_info_t *tech_info;
-       int ret = UAM_ERROR_NONE;
 
        retv_if(NULL == svc_name, UAM_ERROR_INVALID_PARAMETER);
        retv_if(NULL == device_id, UAM_ERROR_INVALID_PARAMETER);
@@ -2602,12 +2599,8 @@ int _uam_core_service_remove_device(const char *svc_name,
 
        mac = __get_mac_addr(tech_info);
        /* Remove service-device from DB */
-       ret = _uam_db_delete_device_service_info(
+       _uam_db_delete_device_service_info(
                        device_id, tech_type, mac, svc_name, app_num);
-       if (UAM_ERROR_NONE != ret) {
-               UAM_ERR("Device service removal from persistent DB failed");
-               return ret;
-       }
 
        FUNC_EXIT;
        return UAM_ERROR_NONE;
@@ -3318,8 +3311,7 @@ int _uam_core_init(void)
                bitmask = _uam_core_get_user_sensors();
 
                /* Set/update registered device list to plugins */
-               if (UAM_ERROR_NONE != _uam_pm_set_registered_devices(devices, bitmask))
-                       UAM_ERR("_uam_pm_set_registered_devices failed");
+               _uam_pm_set_registered_devices(devices, bitmask);
 
                /* Set/update registered device list to cloud plugin */
                _uam_cloud_update_registered_devices();
@@ -3603,12 +3595,8 @@ int _uam_core_handle_device_added(int status,
        __send_device_event(ret, UAM_EVENT_DEVICE_ADDED, dev_info);
 
        /* Set/update registered device list to plugins */
-       ret = _uam_pm_set_registered_devices(devices,
+       _uam_pm_set_registered_devices(devices,
                        __uam_core_tech_type_to_sensor(dev_info->type));
-       if (UAM_ERROR_NONE != ret) {
-               UAM_ERR("_uam_pm_set_registered_devices failed");
-               goto done;
-       }
 
        _uam_cloud_send_device_added(status, user->account, dev_info);
 
@@ -4400,10 +4388,7 @@ void _uam_core_reset_database(void)
 
        bitmask = _uam_core_get_user_sensors();
        /* Set/update registered device list to plugins */
-       ret = _uam_pm_set_registered_devices(devices, bitmask);
-       if (UAM_ERROR_NONE != ret)
-               UAM_ERR("_uam_pm_set_registered_devices failed with %s",
-                               _uam_manager_error_to_str(ret));
+       _uam_pm_set_registered_devices(devices, bitmask);
 
        /* Set/update registered device list to cloud plugin */
        _uam_cloud_update_registered_devices();
@@ -5123,9 +5108,8 @@ int _uam_core_service_add_payload(uam_ble_payload_s *payload,
                service->name, -1, -1, payload, app_num);
 
        /* Set/update registered device list to plugins */
-       if (UAM_ERROR_NONE != _uam_pm_set_registered_devices(devices,
-                       __uam_core_tech_type_to_sensor(db_payload->tech_type)))
-               UAM_ERR("_uam_pm_set_registered_devices failed");
+       _uam_pm_set_registered_devices(devices,
+               __uam_core_tech_type_to_sensor(db_payload->tech_type));
 
        /*** Add payload service mapping to database ***/
        ret = _uam_db_update_device_service_payload_info(payload, service->name, app_num);

diff --git a/ua-daemon/src/ua-manager-request-handler.c b/ua-daemon/src/ua-manager-request-handler.c
index 4a9a12b64aa49f6dce42d7ed3a15e09147e3a9ad..2a46edef5a07cdea81763db43b32e20b54b00713 100755 (executable)
--- a/ua-daemon/src/ua-manager-request-handler.c
+++ b/ua-daemon/src/ua-manager-request-handler.c
@@ -312,11 +312,7 @@ static int __uam_get_sender_app_id(const char *unique_name, char *app_id, int le
        if (ret != AUL_R_OK) {
                UAM_DBG("app_id not found, Check process name");
 
-               ret = __uam_get_process_name_bypid(pid, app_id, len);
-               if (ret != UAM_ERROR_NONE) {
-                       UAM_DBG("process name not found");
-                       return UAM_ERROR_NOT_FOUND;
-               }
+               __uam_get_process_name_bypid(pid, app_id, len);
        }
        UAM_DBG("Sender app_id: %s", app_id);
 

diff --git a/ua-daemon/src/ua-manager-service-db.c b/ua-daemon/src/ua-manager-service-db.c
index 188d7bf3091e968bd03098687048b6665b0f4836..1abf544708e36841379cf31720f3b69b530031aa 100644 (file)
--- a/ua-daemon/src/ua-manager-service-db.c
+++ b/ua-daemon/src/ua-manager-service-db.c
@@ -340,11 +340,8 @@ int _uam_db_delete_service_info(const char *service_name, const int app_num)
        sqlite3_stmt *stmt = delete_service_info;
        int sql_ret = SQLITE_OK;
 
-       error_code = _uam_db_delete_device_service(service_name, app_num);
-       if (UAM_ERROR_NONE != error_code) {
-               UAM_ERR("_uam_db_delete_device_service failed");
-               return error_code;
-       }
+       _uam_db_delete_device_service(service_name, app_num);
+
        retv_if(0 > app_num, UAM_ERROR_INVALID_PARAMETER);
 
        DB_ACTION(sqlite3_bind_text(stmt, 1, service_name, -1, SQLITE_STATIC),