From f6d65de548e47f14eb4c4f485753f44468eb50ae Mon Sep 17 00:00:00 2001
From: Krzysztof Jackiewicz <k.jackiewicz@samsung.com>
Date: Fri, 26 Jun 2015 14:19:36 +0200
Subject: [PATCH] Encryption service refactoring

[Problem] Unnecessary counter in communication manager. Request map name.
[Solution] Counter replaced by size(). Request map renamed.

[Verification] Successfull compilation. Run tests

Change-Id: I757d729de8f26a1bca8af65f1377d43afcc07d79
---
 src/manager/main/communication-manager.h |  7 ++-----
 src/manager/service/encryption-logic.cpp | 10 +++++-----
 src/manager/service/encryption-logic.h   |  2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/manager/main/communication-manager.h b/src/manager/main/communication-manager.h
index 1637a07..13a8a97 100644
--- a/src/manager/main/communication-manager.h
+++ b/src/manager/main/communication-manager.h
@@ -47,12 +47,9 @@ public:
     // Returns the number of listeners called
     size_t SendMessage(const M& msg) const
     {
-        size_t num = 0;
-        for(auto& it : m_listeners) {
+        for(auto& it : m_listeners)
             it(msg);
-            num++;
-        }
-        return num;
+        return m_listeners.size();
     }
 protected:
     MessageManager() {}
diff --git a/src/manager/service/encryption-logic.cpp b/src/manager/service/encryption-logic.cpp
index a2bad2b..36c4e10 100644
--- a/src/manager/service/encryption-logic.cpp
+++ b/src/manager/service/encryption-logic.cpp
@@ -35,7 +35,7 @@ void EncryptionLogic::Crypt(const CryptoRequest& request)
     }
 
     // store request in the map
-    auto ret = m_requests.insert(std::make_pair(request.msgId, request));
+    auto ret = m_requestsMap.insert(std::make_pair(request.msgId, request));
     if (!ret.second) {
         LogError("Request with id " << request.msgId << " already exists");
         m_service.RespondToClient(request, CKM_API_ERROR_INPUT_PARAM);
@@ -47,20 +47,20 @@ void EncryptionLogic::Crypt(const CryptoRequest& request)
         m_service.RequestKey(request);
     } catch (...) {
         LogError("Key request failed");
-        m_requests.erase(request.msgId);
+        m_requestsMap.erase(request.msgId);
         m_service.RespondToClient(request, CKM_API_ERROR_SERVER_ERROR);
     }
 }
 
 void EncryptionLogic::KeyRetrieved(MsgKeyResponse response)
 {
-    auto it = m_requests.find(response.id);
-    if (it == m_requests.end()) {
+    auto it = m_requestsMap.find(response.id);
+    if (it == m_requestsMap.end()) {
         LogError("No matching request found"); // nothing we can do
         return;
     }
     CryptoRequest req = std::move(it->second);
-    m_requests.erase(it);
+    m_requestsMap.erase(it);
 
     if (response.error != CKM_API_SUCCESS) {
         LogError("Attempt to retrieve key failed with error: " << response.error);
diff --git a/src/manager/service/encryption-logic.h b/src/manager/service/encryption-logic.h
index 8f941dd..9dbd7b0 100644
--- a/src/manager/service/encryption-logic.h
+++ b/src/manager/service/encryption-logic.h
@@ -41,7 +41,7 @@ public:
 private:
     IEncryptionService& m_service;
 
-    std::map<int, CryptoRequest> m_requests;
+    std::map<int, CryptoRequest> m_requestsMap;
 };
 
 } /* namespace CKM */
-- 
2.7.4