Fix defects detected by static analysis tool

[platform/core/uifw/isf.git] / ism / modules / panelagent / ecoresocket / ecore_socket_panel_agent_module.cpp

diff --git a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
index c4e856d..38c4d29 100644 (file)
--- a/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
+++ b/ism/modules/panelagent/ecoresocket/ecore_socket_panel_agent_module.cpp
@@ -922,8 +922,8 @@ private:
 
         if (trans.write_to_socket(client_socket)
             && trans.read_from_socket(client_socket)
-            && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY) {
-            trans.get_data(imdata, len);
+            && trans.get_command(cmd) && cmd == SCIM_TRANS_CMD_REPLY
+            && trans.get_data(imdata, len)) {
             LOGD ("length of imdata is %d", len);
         } else {
             LOGW ("read imdata failed");
@@ -2094,7 +2094,7 @@ private:
                     } else if (cmd == ISM_TRANS_CMD_GET_RETURN_KEY_DISABLE) {
                         uint32 disabled;
                         bool ret = true;
-                        m_info_manager->get_ise_return_key_disable(client_id, disabled);
+                        ret = m_info_manager->get_ise_return_key_disable(client_id, disabled);
                         Transaction trans;
                         Socket client_socket(client_id);
 
@@ -3168,22 +3168,14 @@ private:
                     if (m_info_manager->check_privilege_by_sockfd(client_id, IMEMANAGER_PRIVILEGE)) {
                         String strAppid;
                         uint32 nEnabled = 0;
-                        bool ret = true;
-                        //FIXME
-                        //ret need be checked
+
                         m_info_manager->is_helper_ise_enabled(client_id, strAppid, nEnabled);
                         Transaction trans;
                         Socket client_socket(client_id);
                         trans.clear();
                         trans.put_command(SCIM_TRANS_CMD_REPLY);
-
-                        if (ret) {
-                            trans.put_command(SCIM_TRANS_CMD_OK);
-                            trans.put_data(static_cast<uint32>(nEnabled));
-                        } else {
-                            trans.put_command(SCIM_TRANS_CMD_FAIL);
-                        }
-
+                        trans.put_command(SCIM_TRANS_CMD_OK);
+                        trans.put_data(static_cast<uint32>(nEnabled));
                         trans.write_to_socket(client_socket);
                     }
                     else {