[Messaging] Removed compilation warnings

[Verification] Code compiles without errors and warnings.

Change-Id: I240af4c873661a4e38edf2c0ea1136de77e59f7e
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/src/messaging/MsgCommon/FilterIterator.cpp b/src/messaging/MsgCommon/FilterIterator.cpp
index b9403e1282aad3a08bccc9e0c5303e263fac54e3..1ec3427b5ed0d7ceee090b82b5f966a5ec395016 100755 (executable)
--- a/src/messaging/MsgCommon/FilterIterator.cpp
+++ b/src/messaging/MsgCommon/FilterIterator.cpp
@@ -85,7 +85,7 @@ bool FilterIterator::isLastCompositeSubFilter() const
     }
 
     CompositeIterState cfilter = m_composite_stack.top();
-    return (cfilter.filter->getFilters().size() - 1) == cfilter.cur_sub_filter_index;
+    return (int)(cfilter.filter->getFilters().size() - 1) == cfilter.cur_sub_filter_index;
 }
 
 void FilterIterator::operator++(int)

diff --git a/src/messaging/email_manager.cc b/src/messaging/email_manager.cc
index bb40c5efbe6e4aac7a4bae78c9968767c9cc7f07..41fcbadbdf9ae09585ae07c468c1b55ac2392c5e 100755 (executable)
--- a/src/messaging/email_manager.cc
+++ b/src/messaging/email_manager.cc
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
- 
+
 //#include <JSWebAPIErrorFactory.h>
 //#include <JSWebAPIError.h>
 //#include <JSUtil.h>
@@ -1095,7 +1095,8 @@ void EmailManager::updateMessages(MessagesCallbackUserData* callback)
 
         picojson::array array;
         auto messages = callback->getMessages();
-        for (int i = 0 ; i < messages.size(); ++i) {
+        size_t messages_size = messages.size();
+        for (size_t i = 0 ; i < messages_size; ++i) {
           array.push_back(MessagingUtil::messageToJson(messages[i]));
         }
         obj[JSON_DATA] = picojson::value(array);
@@ -1226,7 +1227,6 @@ void EmailManager::findConversations(ConversationCallbackData* callback)
         return;
     }
 
-    int convListCount = 0;
     PlatformResult ret = FindConversationsPlatform(callback);
     if (ret.IsError()) {
         LoggerE("%d (%s)", ret.error_code(), (ret.message()).c_str());

diff --git a/src/messaging/message.cc b/src/messaging/message.cc
index 0e091c3ce12bfe95788e28a7f0c756b934329383..4118236cec3537afcceaade1df39da8b5e7f90d3 100755 (executable)
--- a/src/messaging/message.cc
+++ b/src/messaging/message.cc
@@ -355,10 +355,9 @@ PlatformResult saveToTempFile(const std::string &data, std::string* file_name)
 {
     LoggerD("Entered");
     char buf[] = "XXXXXX";
-    int res = 0;
 
     mode_t mask = umask(S_IWGRP | S_IWOTH);
-    res = mkstemp(buf);   //Just generate unique name
+    mkstemp(buf);   //Just generate unique name
 
     std::string tmp_name = std::string("/tmp/") + buf;
 

diff --git a/src/messaging/message_service.cc b/src/messaging/message_service.cc
index c32f7bb72c7818d621fd7cface1acfea2740a6ae..5d16f68bab1f9db8292eadc7da065fb32a50cba0 100755 (executable)
--- a/src/messaging/message_service.cc
+++ b/src/messaging/message_service.cc
@@ -36,7 +36,6 @@ namespace{
 const char* JSON_SERVICE_ID = "id";
 const char* JSON_SERVICE_TYPE = "type";
 const char* JSON_SERVICE_NAME = "name";
-const char* JSON_SERVICE_STORAGE = "messageStorage";
 }
 
 //#################### MessageRecipientsCallbackData ####################

diff --git a/src/messaging/message_storage_email.cc b/src/messaging/message_storage_email.cc
index 0567ef83eb72705485f49a12b7adcf9eacf585e8..cbb63d9e2bae3ed9dad89a63ddf102a685fc5dce 100755 (executable)
--- a/src/messaging/message_storage_email.cc
+++ b/src/messaging/message_storage_email.cc
@@ -47,27 +47,6 @@ static gboolean addDraftMessageTask(void* data)
     return FALSE;
 }
 
-static gboolean callError(void* data)
-{
-    LoggerD("Entered");
-    MessageCallbackUserData* callback =
-           static_cast<MessageCallbackUserData*>(data);
-    if (!callback) {
-       LoggerE("Callback is null");
-       return FALSE;
-    }
-
-    auto json = callback->getJson();
-    picojson::object& obj = json->get<picojson::object>();
-    if (json->contains(JSON_CALLBACK_ID) && obj.at(JSON_CALLBACK_ID).is<double>()) {
-      callback->getQueue().resolve(obj.at(JSON_CALLBACK_ID).get<double>(),
-                                       json->serialize());
-    } else {
-      LoggerE("json is incorrect - missing required member");
-    }
-    return FALSE;
-}
-
 void MessageStorageEmail::addDraftMessage(MessageCallbackUserData* callback) {
     LoggerD("Entered");
 

diff --git a/src/messaging/messaging_instance.cc b/src/messaging/messaging_instance.cc
index 3bc7bc334db3be13b7b8ee6880a4881e4a01f918..33d880f80cd5e21251ebdab120f3bae3030abdb5 100755 (executable)
--- a/src/messaging/messaging_instance.cc
+++ b/src/messaging/messaging_instance.cc
@@ -48,7 +48,6 @@ const char* SEND_MESSAGE_ARGS_MESSAGE = "message";
 const char* SEND_MESSAGE_ARGS_SIMINDEX = "simIndex";
 
 const char* FUN_MESSAGE_SERVICE_LOAD_MESSAGE_BODY = "MessageService_loadMessageBody";
-const char* LOAD_MESSAGE_BODY_ARGS_MESSAGE = "message";
 
 const char* FUN_MESSAGE_SERVICE_LOAD_MESSAGE_ATTACHMENT = "MessageService_loadMessageAttachment";
 const char* LOAD_MESSAGE_ATTACHMENT_ARGS_ATTACHMENT = "attachment";
@@ -70,10 +69,6 @@ const char* FUN_MESSAGE_STORAGE_ADD_DRAFT_MESSAGE = "MessageStorage_addDraftMess
 const char* ADD_DRAFT_MESSAGE_ARGS_MESSAGE = "message";
 
 const char* FUN_MESSAGE_STORAGE_FIND_MESSAGES = "MessageStorage_findMessages";
-const char* FIND_MESSAGES_ARGS_FILTER = "filter";
-const char* FIND_MESSAGES_ARGS_SORT = "sort";
-const char* FIND_MESSAGES_ARGS_LIMIT = "limit";
-const char* FIND_MESSAGES_ARGS_OFFSET = "offset";
 
 const char* FUN_MESSAGE_STORAGE_REMOVE_MESSAGES = "MessageStorage_removeMessages";
 const char* REMOVE_MESSAGES_ARGS_MESSAGES = "messages";
@@ -82,8 +77,6 @@ const char* FUN_MESSAGE_STORAGE_UPDATE_MESSAGES = "MessageStorage_updateMessages
 const char* UPDATE_MESSAGES_ARGS_MESSAGES = "messages";
 
 const char* FUN_MESSAGE_STORAGE_FIND_CONVERSATIONS = "MessageStorage_findConversations";
-const char* FIND_CONVERSATIONS_ARGS_FILTER = "filter";
-const char* FIND_CONVERSATIONS_ARGS_SORT = "sort";
 const char* FIND_CONVERSATIONS_ARGS_LIMIT = "limit";
 const char* FIND_CONVERSATIONS_ARGS_OFFSET = "offset";
 
@@ -91,26 +84,17 @@ const char* FUN_MESSAGE_STORAGE_REMOVE_CONVERSATIONS = "MessageStorage_removeCon
 const char* REMOVE_CONVERSATIONS_ARGS_CONVERSATIONS = "conversations";
 
 const char* FUN_MESSAGE_STORAGE_FIND_FOLDERS = "MessageStorage_findFolders";
-const char* FIND_FOLDERS_ARGS_FILTER = "filter";
-const char* FIND_FOLDERS_ARGS_SORT = "sort";
 const char* FIND_FOLDERS_ARGS_LIMIT = "limit";
 const char* FIND_FOLDERS_ARGS_OFFSET = "offset";
 
 const char* FUN_MESSAGE_STORAGE_ADD_MESSAGES_CHANGE_LISTENER =
         "MessageStorage_addMessagesChangeListener";
-const char* ADD_MESSAGES_CHANGE_LISTENER_ARGS_LISTENERS = "listeners";
-const char* ADD_MESSAGES_CHANGE_LISTENER_ARGS_FILTER = "filter";
 
 const char* FUN_MESSAGE_STORAGE_ADD_CONVERSATIONS_CHANGE_LISTENER =
         "MessageStorage_addConversationsChangeListener";
-const char* ADD_CONVERSATION_CHANGE_LISTENER_ARGS_LISTENERS =
-        "listeners";
-const char* ADD_CONVERSATION_CHANGE_LISTENER_ARGS_FILTER = "filter";
 
 const char* FUN_MESSAGE_STORAGE_ADD_FOLDER_CHANGE_LISTENER =
         "MessageStorage_addFoldersChangeListener";
-const char* ADD_FOLDER_CHANGE_LISTENER_ARGS_LISTENERS = "listeners";
-const char* ADD_FOLDER_CHANGE_LISTENER_ARGS_FILTER = "filter";
 
 const char* FUN_MESSAGE_STORAGE_REMOVE_CHANGE_LISTENER = "MessageStorage_removeChangeListener";
 const char* REMOVE_CHANGE_LISTENER_ARGS_WATCHID = "watchId";

diff --git a/src/messaging/messaging_manager.cc b/src/messaging/messaging_manager.cc
index 9fdf5bd3a25c5c67cf314197ad43ee7dbcd862c3..80c204a14340ea68d9bfa0bfc8a3bacfca772ebb 100755 (executable)
--- a/src/messaging/messaging_manager.cc
+++ b/src/messaging/messaging_manager.cc
@@ -227,6 +227,8 @@ static void* getMsgServicesThread(const std::shared_ptr<MsgManagerCallbackData>&
           }
         }
         break;
+      default:
+        platform_result = PlatformResult(ErrorCode::UNKNOWN_ERR, "Service type is undefined");
     }
   } else {
     LoggerE("Unsupported service type");

diff --git a/src/messaging/messaging_util.cc b/src/messaging/messaging_util.cc
index cbbda696d127162813c49b4db612bbc95bc558e3..d7006b55f990a115a8ee9e281552f2f4623be812 100755 (executable)
--- a/src/messaging/messaging_util.cc
+++ b/src/messaging/messaging_util.cc
@@ -348,6 +348,7 @@ picojson::value MessagingUtil::messageToJson(std::shared_ptr<Message> message)
     picojson::object o;
 
     std::vector<picojson::value> array;
+    std::vector<std::string> bcc, cc;
     auto vectorToArray = [&array] (std::string& s)->void {
         array.push_back(picojson::value(s));
     };
@@ -362,12 +363,12 @@ picojson::value MessagingUtil::messageToJson(std::shared_ptr<Message> message)
         break;
     case MessageType::EMAIL:
 
-        std::vector<std::string> cc = message->getCC();
+        cc = message->getCC();
         for_each(cc.begin(), cc.end(), vectorToArray);
         o[MESSAGE_ATTRIBUTE_CC] = picojson::value(array);
         array.clear();
 
-        std::vector<std::string> bcc = message->getBCC();
+        bcc = message->getBCC();
         for_each(bcc.begin(), bcc.end(), vectorToArray);
         o[MESSAGE_ATTRIBUTE_BCC] = picojson::value(array);
         array.clear();
@@ -377,6 +378,9 @@ picojson::value MessagingUtil::messageToJson(std::shared_ptr<Message> message)
         o[MESSAGE_ATTRIBUTE_SUBJECT] = picojson::value(message->getSubject());
         o[MESSAGE_ATTRIBUTE_OLD_ID] = picojson::value(std::to_string(message->getOldId()));
 
+        break;
+    default:
+        LoggerW("Unsupported message type");
         break;
     }
 
@@ -470,6 +474,7 @@ picojson::value MessagingUtil::conversationToJson(std::shared_ptr<MessageConvers
     for_each(to.begin(), to.end(), vectorToArray);
     o[MESSAGE_ATTRIBUTE_TO] = picojson::value(array);
     array.clear();
+    std::vector<std::string> cc, bcc;
 
     switch (conversation->getType()) {
         case MessageType::SMS:
@@ -480,16 +485,19 @@ picojson::value MessagingUtil::conversationToJson(std::shared_ptr<MessageConvers
         case MessageType::EMAIL:
             o[MESSAGE_ATTRIBUTE_SUBJECT] = picojson::value(conversation->getSubject());
 
-            std::vector<std::string> cc = conversation->getCC();
+            cc = conversation->getCC();
             for_each(cc.begin(), cc.end(), vectorToArray);
             o[MESSAGE_ATTRIBUTE_CC] = picojson::value(array);
             array.clear();
 
-            std::vector<std::string> bcc = conversation->getBCC();
+            bcc = conversation->getBCC();
             for_each(bcc.begin(), bcc.end(), vectorToArray);
             o[MESSAGE_ATTRIBUTE_BCC] = picojson::value(array);
             array.clear();
 
+            break;
+        default:
+            LoggerW("Unsupported message type");
             break;
         }
 
@@ -571,6 +579,9 @@ PlatformResult MessagingUtil::jsonToMessage(const picojson::value& json,
             message = std::shared_ptr<Message>(new MessageEmail());
         }
         break;
+    default:
+        LoggerE("Not supported message type");
+        break;
     }
 
     std::vector<std::string> result;