From 11fd615a9ea61c650dd007b4085e3acc10d4e535 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Wed, 1 Jul 2015 15:00:42 +0200 Subject: [PATCH] [Messaging] Removed compilation warnings [Verification] Code compiles without errors and warnings. Change-Id: I240af4c873661a4e38edf2c0ea1136de77e59f7e Signed-off-by: Piotr Kosko --- src/messaging/MsgCommon/FilterIterator.cpp | 2 +- src/messaging/email_manager.cc | 6 +++--- src/messaging/message.cc | 3 +-- src/messaging/message_service.cc | 1 - src/messaging/message_storage_email.cc | 21 --------------------- src/messaging/messaging_instance.cc | 16 ---------------- src/messaging/messaging_manager.cc | 2 ++ src/messaging/messaging_util.cc | 19 +++++++++++++++---- 8 files changed, 22 insertions(+), 48 deletions(-) diff --git a/src/messaging/MsgCommon/FilterIterator.cpp b/src/messaging/MsgCommon/FilterIterator.cpp index b9403e12..1ec3427b 100755 --- 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 bb40c5ef..41fcbadb 100755 --- 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 //#include //#include @@ -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 0e091c3c..4118236c 100755 --- 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 c32f7bb7..5d16f68b 100755 --- 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 0567ef83..cbb63d9e 100755 --- 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(data); - if (!callback) { - LoggerE("Callback is null"); - return FALSE; - } - - auto json = callback->getJson(); - picojson::object& obj = json->get(); - if (json->contains(JSON_CALLBACK_ID) && obj.at(JSON_CALLBACK_ID).is()) { - callback->getQueue().resolve(obj.at(JSON_CALLBACK_ID).get(), - 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 3bc7bc33..33d880f8 100755 --- 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 9fdf5bd3..80c204a1 100755 --- a/src/messaging/messaging_manager.cc +++ b/src/messaging/messaging_manager.cc @@ -227,6 +227,8 @@ static void* getMsgServicesThread(const std::shared_ptr& } } 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 cbbda696..d7006b55 100755 --- a/src/messaging/messaging_util.cc +++ b/src/messaging/messaging_util.cc @@ -348,6 +348,7 @@ picojson::value MessagingUtil::messageToJson(std::shared_ptr message) picojson::object o; std::vector array; + std::vector 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) break; case MessageType::EMAIL: - std::vector cc = message->getCC(); + cc = message->getCC(); for_each(cc.begin(), cc.end(), vectorToArray); o[MESSAGE_ATTRIBUTE_CC] = picojson::value(array); array.clear(); - std::vector 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) 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 cc, bcc; switch (conversation->getType()) { case MessageType::SMS: @@ -480,16 +485,19 @@ picojson::value MessagingUtil::conversationToJson(std::shared_ptrgetSubject()); - std::vector cc = conversation->getCC(); + cc = conversation->getCC(); for_each(cc.begin(), cc.end(), vectorToArray); o[MESSAGE_ATTRIBUTE_CC] = picojson::value(array); array.clear(); - std::vector 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(new MessageEmail()); } break; + default: + LoggerE("Not supported message type"); + break; } std::vector result; -- 2.34.1