From e5bbbcd5b8e5b1cc3db4c81875bbb5289e9224fb Mon Sep 17 00:00:00 2001 From: Maciej Socha Date: Tue, 21 Jul 2015 13:33:57 +0200 Subject: [PATCH] Messaging plugin: removed multiple warnings found by cppcheck [Verification] TCT results: email: Before - 100% After - 100% mms: Before - 100% After - 100% sms: Before - 100% After - 100% Change-Id: Ia833bc5779cc557af53a3c1efeddebcd4e453cb8 Signed-off-by: Maciej Socha --- src/messaging/MsgCommon/CompositeFilter.cpp | 2 +- src/messaging/email_manager.cc | 13 ++++--------- src/messaging/message.cc | 4 +++- src/messaging/message.h | 2 +- src/messaging/message_conversation.cc | 4 +--- src/messaging/messaging_database_manager.cc | 3 +-- src/messaging/messaging_instance.cc | 1 - src/messaging/messaging_util.cc | 8 ++++---- src/messaging/messaging_util.h | 6 +++--- src/messaging/short_message_manager.cc | 5 ++--- 10 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/messaging/MsgCommon/CompositeFilter.cpp b/src/messaging/MsgCommon/CompositeFilter.cpp index ae1ca53f..ea68e7e4 100755 --- a/src/messaging/MsgCommon/CompositeFilter.cpp +++ b/src/messaging/MsgCommon/CompositeFilter.cpp @@ -75,7 +75,7 @@ bool CompositeFilter::isMatching(const FilterableObject* const filtered_object) else { AbstractFilterPtrVector::const_iterator it = src_filters.begin(); AbstractFilterPtrVector::const_iterator end_it = src_filters.end(); - for(;it != end_it; it++) { + for(;it != end_it; ++it) { const bool last_result = (*it)->isMatching(filtered_object); if(INTERSECTION == m_type) { diff --git a/src/messaging/email_manager.cc b/src/messaging/email_manager.cc index 41fcbadb..a26c8bc5 100755 --- a/src/messaging/email_manager.cc +++ b/src/messaging/email_manager.cc @@ -551,8 +551,7 @@ email_mail_data_t* EmailManager::loadMessage(int msg_id) { LoggerD("Entered"); email_mail_data_t* mail_data = NULL; - int err = EMAIL_ERROR_NONE; - err = email_get_mail_data(msg_id, &mail_data); + int err = email_get_mail_data(msg_id, &mail_data); if (EMAIL_ERROR_NONE != err) { LoggerE("email_get_mail_data failed. [%d]", err); } else { @@ -601,10 +600,9 @@ void EmailManager::loadMessageBody(MessageBodyCallbackData* callback) m_proxy_load_body->addCallback(callback); const int mailId = callback->getMessage()->getId(); - int err = EMAIL_ERROR_NONE; int op_handle = -1; - err = email_download_body(mailId, 0, &op_handle); + int err = email_download_body(mailId, 0, &op_handle); if(EMAIL_ERROR_NONE != err){ LoggerE("Email download body failed, %d", err); m_proxy_load_body->removeCallback(callback); @@ -754,15 +752,13 @@ void EmailManager::syncFolder(SyncFolderCallbackData* callback) return; } - int err = EMAIL_ERROR_NONE; - email_mailbox_t* mailbox = NULL; const std::string folder_id_str = callback->getMessageFolder()->getId(); int folder_id = 0; std::istringstream(folder_id_str) >> folder_id; - err = email_get_mailbox_by_mailbox_id(folder_id, &mailbox); + int err = email_get_mailbox_by_mailbox_id(folder_id, &mailbox); if (EMAIL_ERROR_NONE != err || NULL == mailbox) { LoggerE("Couldn't get mailbox, error code: %d", err); @@ -820,8 +816,7 @@ void EmailManager::stopSync(long op_id) return; } - int err = EMAIL_ERROR_NONE; - err = email_cancel_job(callback->getAccountId(), + int err = email_cancel_job(callback->getAccountId(), callback->getOperationHandle(), EMAIL_CANCELED_BY_USER); diff --git a/src/messaging/message.cc b/src/messaging/message.cc index 4118236c..fac18185 100755 --- a/src/messaging/message.cc +++ b/src/messaging/message.cc @@ -371,6 +371,8 @@ PlatformResult saveToTempFile(const std::string &data, std::string* file_name) } if (fprintf(file, "%s", data.c_str()) < 0) { LoggerE("Failed to write data into file"); + fclose(file); + remove(tmp_name.c_str()); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to write data into file"); } fflush(file); @@ -737,7 +739,7 @@ PlatformResult Message::addMMSRecipientsToStruct(const std::vector return PlatformResult(ErrorCode::NO_ERROR); } -PlatformResult Message::addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVector attach, +PlatformResult Message::addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVector &attach, msg_struct_t &mms_struct, Message* message) { LoggerD("Entered with %d attachments", attach.size()); diff --git a/src/messaging/message.h b/src/messaging/message.h index cad0f287..5b130a1e 100755 --- a/src/messaging/message.h +++ b/src/messaging/message.h @@ -146,7 +146,7 @@ public: // function for filling Message attributes static common::PlatformResult convertPlatformShortMessageToObject(msg_struct_t msg, Message** message); static common::PlatformResult findShortMessageById(const int id, MessagePtr* message); - static common::PlatformResult addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVector attach, + static common::PlatformResult addMMSBodyAndAttachmentsToStruct(const AttachmentPtrVector &attach, msg_struct_t &mms_struct, Message* message); static common::PlatformResult setMMSBodyAndAttachmentsFromStruct(Message *message, diff --git a/src/messaging/message_conversation.cc b/src/messaging/message_conversation.cc index 5e9fbf1a..ce70e45b 100755 --- a/src/messaging/message_conversation.cc +++ b/src/messaging/message_conversation.cc @@ -131,8 +131,6 @@ PlatformResult MessageConversation::convertMsgConversationToObject( msg_list_handle_t addr_list = NULL; msg_struct_t addr_info = NULL; - msg_error_t err = MSG_SUCCESS; - int tempInt; bool tempBool; int nToCnt; @@ -154,7 +152,7 @@ PlatformResult MessageConversation::convertMsgConversationToObject( std::unique_ptr::type, int(*)(msg_struct_t*)> msg_thread_ptr(&msg_thread, &msg_release_struct); // automatically release the memory - err = msg_get_thread(handle, conversation->m_conversation_id, msg_thread); + msg_error_t err = msg_get_thread(handle, conversation->m_conversation_id, msg_thread); if (err != MSG_SUCCESS) { LoggerE("Failed to retrieve thread."); diff --git a/src/messaging/messaging_database_manager.cc b/src/messaging/messaging_database_manager.cc index 89214980..8731c7f6 100755 --- a/src/messaging/messaging_database_manager.cc +++ b/src/messaging/messaging_database_manager.cc @@ -200,14 +200,13 @@ __thread sqlite3_stmt* stmt = NULL; msg_error_t MessagingDatabaseManager::connect() { LoggerD("Entered"); - int err = 0; if (NULL == sqlHandle) { char strDBName[64]; memset(strDBName, 0x00, sizeof(strDBName)); snprintf(strDBName, sizeof(strDBName), "%s", MSG_DB_NAME); - err = db_util_open(strDBName, &sqlHandle, DB_UTIL_REGISTER_HOOK_METHOD); + int err = db_util_open(strDBName, &sqlHandle, DB_UTIL_REGISTER_HOOK_METHOD); if (SQLITE_OK != err) { LoggerE("DB connecting fail [%d]", err); diff --git a/src/messaging/messaging_instance.cc b/src/messaging/messaging_instance.cc index 33d880f8..9d891820 100755 --- a/src/messaging/messaging_instance.cc +++ b/src/messaging/messaging_instance.cc @@ -593,7 +593,6 @@ void MessagingInstance::MessageStorageUpdateMessages(const picojson::value& args auto callback = new MessagesCallbackUserData(queue_); - std::vector> messages; std::for_each(pico_array.begin(), pico_array.end(), [&callback](picojson::value& v)->void { std::shared_ptr message; PlatformResult ret = MessagingUtil::jsonToMessage(v, &message); diff --git a/src/messaging/messaging_util.cc b/src/messaging/messaging_util.cc index 99014e00..eff1e33a 100755 --- a/src/messaging/messaging_util.cc +++ b/src/messaging/messaging_util.cc @@ -232,7 +232,7 @@ std::string MessagingUtil::ltrim(const std::string& input) LoggerD("Entered"); std::string str = input; std::string::iterator i; - for (i = str.begin(); i != str.end(); i++) { + for (i = str.begin(); i != str.end(); ++i) { if (!isspace(*i)) { break; } @@ -1034,7 +1034,7 @@ PostQueue::~PostQueue() EmailManager::getInstance().RemoveCallbacksByQueue(*this); } -void PostQueue::addAndResolve(const long cid, PostPriority priority, const std::string json) +void PostQueue::addAndResolve(const long cid, PostPriority priority, const std::string &json) { LoggerD("Entered"); @@ -1060,7 +1060,7 @@ void PostQueue::add(const long cid, PostPriority priority) return; } -void PostQueue::resolve(const long cid, const std::string json) +void PostQueue::resolve(const long cid, const std::string &json) { LoggerD("Entered: [%p]", this); @@ -1143,7 +1143,7 @@ PostQueue::PostTask::~PostTask() LoggerD("Entered"); } -void PostQueue::PostTask::attach(const std::string j) +void PostQueue::PostTask::attach(const std::string &j) { LoggerD("Entered"); if (TaskState::DONE == state_) { diff --git a/src/messaging/messaging_util.h b/src/messaging/messaging_util.h index c1fe5a5b..06d7abdc 100755 --- a/src/messaging/messaging_util.h +++ b/src/messaging/messaging_util.h @@ -199,9 +199,9 @@ public: explicit PostQueue(MessagingInstance& instance); ~PostQueue(); - void addAndResolve(const long cid, PostPriority priority, const std::string json); + void addAndResolve(const long cid, PostPriority priority, const std::string &json); void add(const long cid, PostPriority priority = PostPriority::LAST); - void resolve(const long cid, const std::string json); + void resolve(const long cid, const std::string &json); enum TaskState { NEW = 0, @@ -227,7 +227,7 @@ private: PostTask(); PostTask(PostPriority p); ~PostTask(); - void attach(const std::string j); + void attach(const std::string &j); PostPriority priority(); TaskState state(); std::string json(); diff --git a/src/messaging/short_message_manager.cc b/src/messaging/short_message_manager.cc index d3b516a2..bcbd0bd0 100755 --- a/src/messaging/short_message_manager.cc +++ b/src/messaging/short_message_manager.cc @@ -469,7 +469,7 @@ PlatformResult ShortMsgManager::callProperEventMessages(EventMessages* event, ConversationPtrVector updated_conv; for(ConversationPtrVector::iterator it = eventConv->items.begin(); - it != eventConv->items.end(); it++) { + it != eventConv->items.end(); ++it) { ConversationPtr cur_conv = *it; const bool new_conv = (cur_conv->getMessageCount() <= 1); if(new_conv) { @@ -762,7 +762,6 @@ void ShortMsgManager::removeMessages(MessagesCallbackUserData* callback) return; } - int error; std::vector> messages; { @@ -792,7 +791,7 @@ void ShortMsgManager::removeMessages(MessagesCallbackUserData* callback) break; } - error = msg_delete_message(m_msg_handle, id); + int error = msg_delete_message(m_msg_handle, id); if (MSG_SUCCESS != error) { LoggerE("Error while deleting message"); callback->SetError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Error while deleting message")); -- 2.34.1