From: Rafal Walczyna Date: Mon, 23 Apr 2018 12:14:56 +0000 (+0200) Subject: [common] Coverity issues fix X-Git-Tag: submit/tizen/20180427.125243~2^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F176911%2F2;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [common] Coverity issues fix [Feature] Fixed coverity issues with below ids: 112270, 112248, 112261, 112244, 110974, 106503, 110555, 105980, 110371, 108240, 105141, 110066, 109641, 109341, 109028, 108310, 106161, 105761, 105746, 108409, 108493, 106299, 106009, 105130, 105410 [Verification] 100% passrate for modules: alarm, bluetooth, contact, content, email, filesystem, humanactivitymonitor, mms, sms, voice-control Change-Id: Ic32295ee12e9a8830d2e071e003a0045d0c5355e Signed-off-by: Rafal Walczyna --- diff --git a/src/alarm/alarm_manager.cc b/src/alarm/alarm_manager.cc index c7d67a11..1669bb6f 100644 --- a/src/alarm/alarm_manager.cc +++ b/src/alarm/alarm_manager.cc @@ -143,14 +143,15 @@ void AlarmManager::Add(const picojson::value& args, picojson::object& out) { } std::string delay_str = std::to_string(delay); - int ret = app_control_add_extra_data(app_control, kAlarmRelativeDelayKey, delay_str.c_str()); - if (APP_CONTROL_ERROR_NONE != ret) { + int ret_app = app_control_add_extra_data(app_control, kAlarmRelativeDelayKey, delay_str.c_str()); + if (APP_CONTROL_ERROR_NONE != ret_app) { LogAndReportError( PlatformResult(ErrorCode::UNKNOWN_ERR, "Fail to add data from app_control."), &out, - ("Fail to add data from app_control: %d (%s)", ret, get_error_message(ret))); + ("Fail to add data from app_control: %d (%s)", ret_app, get_error_message(ret_app))); return; } + int ret = ALARM_ERROR_NONE; if (!isPeriodSet) { ret = alarm_schedule_once_after_delay(app_control, delay, &alarm_id); } else { @@ -628,10 +629,10 @@ PlatformResult AlarmManager::GetAlarm(int id, picojson::object& obj) { ("Unknown error occurred: %d (%s)", ret, get_error_message(ret))); } - ret = app_control_get_extra_data(app_control, kAlarmRelativeDelayKey, &delay_string); + int ret_app = app_control_get_extra_data(app_control, kAlarmRelativeDelayKey, &delay_string); if (APP_CONTROL_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::NOT_FOUND_ERR, "Failed to get data.", - ("Failed to get data: %d (%s)", ret, get_error_message(ret))); + ("Failed to get data: %d (%s)", ret_app, get_error_message(ret_app))); } obj.insert(std::make_pair("type", picojson::value(kAlarmRelative))); diff --git a/src/bluetooth/bluetooth_health_profile_handler.cc b/src/bluetooth/bluetooth_health_profile_handler.cc index 2aeacb58..e5c483cd 100644 --- a/src/bluetooth/bluetooth_health_profile_handler.cc +++ b/src/bluetooth/bluetooth_health_profile_handler.cc @@ -112,12 +112,12 @@ void BluetoothHealthProfileHandler::OnConnected(int result, const char* remote_a response_obj.insert(std::make_pair(kId, picojson::value(app_id))); response_obj.insert(std::make_pair(kEvent, picojson::value(kOnConnect))); - picojson::value result = picojson::value(picojson::object()); + picojson::value result_picojson = picojson::value(picojson::object()); BluetoothHealthChannel::ToJson(channel, type, device_info, app_id, - &result.get()); + &result_picojson.get()); - ReportSuccess(result, response_obj); + ReportSuccess(result_picojson, response_obj); bt_adapter_free_device_info(device_info); object->instance_.FireEvent("BLUETOOTH_HEALTH_APPLICATION_CHANGED", response); @@ -139,11 +139,11 @@ void BluetoothHealthProfileHandler::OnConnected(int result, const char* remote_a object->connected_channels_.insert(channel); } - picojson::value result = picojson::value(picojson::object()); + picojson::value result_picojson = picojson::value(picojson::object()); - BluetoothHealthChannel::ToJson(channel, type, &result.get()); + BluetoothHealthChannel::ToJson(channel, type, &result_picojson.get()); - ReportSuccess(result, response->get()); + ReportSuccess(result_picojson, response->get()); } else { LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to establish a connection with health profile"), diff --git a/src/bluetooth/bluetooth_le_adapter.cc b/src/bluetooth/bluetooth_le_adapter.cc index 83dabfc4..b2f0be32 100644 --- a/src/bluetooth/bluetooth_le_adapter.cc +++ b/src/bluetooth/bluetooth_le_adapter.cc @@ -69,11 +69,11 @@ class HexData { common::tools::HexToBin(p_data, size, (unsigned char*)pointer(), length_); } - const char* const pointer() const { + const char* pointer() const { return pointer_.get(); } - const int length() const { + int length() const { return length_; } diff --git a/src/contact/contact_util.cc b/src/contact/contact_util.cc index 52b6aa08..eeefc421 100644 --- a/src/contact/contact_util.cc +++ b/src/contact/contact_util.cc @@ -1465,7 +1465,7 @@ PlatformResult ExportContactRelationshipToContactsRecord(contacts_record_h conta } else if (type == kContactRelationshipTypeCustom) { type_to_set = CONTACTS_RELATIONSHIP_TYPE_CUSTOM; } else { - type_to_set = CONTACTS_MESSENGER_TYPE_OTHER; + type_to_set = CONTACTS_RELATIONSHIP_TYPE_OTHER; } status = ContactUtil::SetIntInRecord(child_record, _contacts_relationship.type, type_to_set); diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc index 53c79bc8..9c069ed1 100644 --- a/src/content/content_manager.cc +++ b/src/content/content_manager.cc @@ -958,7 +958,7 @@ void ContentManager::createPlaylist(std::string name, if (playlist != NULL) { int id, cnt; char* thumb_path = NULL; - char* name = NULL; + char* name_playlist = NULL; filter_h filter = NULL; if (media_playlist_get_playlist_id(playlist, &id) == MEDIA_CONTENT_ERROR_NONE) { o["id"] = picojson::value(std::to_string(id)); @@ -978,9 +978,9 @@ void ContentManager::createPlaylist(std::string name, } else { LoggerE("Invalid thumbnail path for playlist."); } - if (media_playlist_get_name(playlist, &name) == MEDIA_CONTENT_ERROR_NONE) { - o["name"] = picojson::value(std::string(name)); - free(name); + if (media_playlist_get_name(playlist, &name_playlist) == MEDIA_CONTENT_ERROR_NONE) { + o["name"] = picojson::value(std::string(name_playlist)); + free(name_playlist); } else { LoggerE("Invalid name for playlist."); } diff --git a/src/filesystem/filesystem_manager.cc b/src/filesystem/filesystem_manager.cc index 44d343ca..ad518b07 100644 --- a/src/filesystem/filesystem_manager.cc +++ b/src/filesystem/filesystem_manager.cc @@ -289,7 +289,8 @@ void FilesystemManager::MakeDirectory(const std::string& path, result_cb(make_directory_worker(path)); } -void FilesystemManager::Rename(const std::string& oldPath, const std::string& newPath, +// pass oldPath by copy to prevent possible TOCTOU bug +void FilesystemManager::Rename(const std::string oldPath, const std::string& newPath, const std::function& success_cb, const std::function& error_cb) { ScopeLogger(); diff --git a/src/filesystem/filesystem_manager.h b/src/filesystem/filesystem_manager.h index e0d2d12b..eaadf9ba 100644 --- a/src/filesystem/filesystem_manager.h +++ b/src/filesystem/filesystem_manager.h @@ -69,7 +69,7 @@ class FilesystemManager { const std::function& success_cb, const std::function& error_cb); - void Rename(const std::string& oldPath, const std::string& newPath, + void Rename(const std::string oldPath, const std::string& newPath, const std::function& success_cb, const std::function& error_cb); diff --git a/src/filesystem/filesystem_stat.cc b/src/filesystem/filesystem_stat.cc index feb7bed6..bb5bc89b 100644 --- a/src/filesystem/filesystem_stat.cc +++ b/src/filesystem/filesystem_stat.cc @@ -59,7 +59,8 @@ picojson::value FilesystemStat::toJSON() const { return retval; } -FilesystemStat FilesystemStat::getStat(const std::string& path) { +// pass path by copy to prevent possible TOCTOU bug +FilesystemStat FilesystemStat::getStat(const std::string path) { ScopeLogger(); struct stat aStatObj; FilesystemStat _result; diff --git a/src/filesystem/filesystem_stat.h b/src/filesystem/filesystem_stat.h index a984ab1d..31c58875 100755 --- a/src/filesystem/filesystem_stat.h +++ b/src/filesystem/filesystem_stat.h @@ -49,7 +49,7 @@ class FilesystemStat { picojson::value toJSON() const; - static FilesystemStat getStat(const std::string& path); + static FilesystemStat getStat(const std::string path); }; } // namespace filesystem } // namespace extension diff --git a/src/humanactivitymonitor/humanactivitymonitor_manager.cc b/src/humanactivitymonitor/humanactivitymonitor_manager.cc index 457c3987..e174ccf8 100644 --- a/src/humanactivitymonitor/humanactivitymonitor_manager.cc +++ b/src/humanactivitymonitor/humanactivitymonitor_manager.cc @@ -442,7 +442,7 @@ class HumanActivityMonitorManager::Monitor::GestureMonitor bool supported = false; int ret = gesture_is_supported(GESTURE_WRIST_UP, &supported); - if (ret != SENSOR_ERROR_NONE) { + if (GESTURE_ERROR_NONE != ret) { if (ret == GESTURE_ERROR_NOT_SUPPORTED) { return LogAndCreateResult(ErrorCode::NOT_SUPPORTED_ERR, "WRIST_UP gesture check failed", ("gesture_is_supported(GESTURE_WRIST_UP), error: %d (%s)", ret, diff --git a/src/messaging/MsgCommon/AbstractFilter.cpp b/src/messaging/MsgCommon/AbstractFilter.cpp index b0365810..ad1db04a 100644 --- a/src/messaging/MsgCommon/AbstractFilter.cpp +++ b/src/messaging/MsgCommon/AbstractFilter.cpp @@ -45,34 +45,6 @@ bool AbstractFilter::isMatching(const FilterableObject* const tested_object) con return false; } -AttributeFilterPtr castToAttributeFilter(AbstractFilterPtr from) { - if (ATTRIBUTE_FILTER != from->getFilterType()) { - LoggerE("Trying to get AttributeFilterPtr but filter's type is: %d", from->getFilterType()); - return AttributeFilterPtr(); - } - - return std::dynamic_pointer_cast(from); -} - -AttributeRangeFilterPtr castToAttributeRangeFilter(AbstractFilterPtr from) { - if (ATTRIBUTE_RANGE_FILTER != from->getFilterType()) { - LoggerE("Trying to get AttributeRangeFilterPtr but filter's type is: %d", - from->getFilterType()); - return AttributeRangeFilterPtr(); - } - - return std::dynamic_pointer_cast(from); -} - -CompositeFilterPtr castToCompositeFilter(AbstractFilterPtr from) { - if (COMPOSITE_FILTER != from->getFilterType()) { - LoggerE("Trying to get CompositeFilterPtr but filter's type is: %d", from->getFilterType()); - return CompositeFilterPtr(); - } - - return std::dynamic_pointer_cast(from); -} - namespace { inline std::string convertToLowerCase(const std::string& input_string) { diff --git a/src/messaging/MsgCommon/AbstractFilter.h b/src/messaging/MsgCommon/AbstractFilter.h index 3d911730..db721e95 100644 --- a/src/messaging/MsgCommon/AbstractFilter.h +++ b/src/messaging/MsgCommon/AbstractFilter.h @@ -27,15 +27,6 @@ namespace extension { namespace tizen { -class AttributeFilter; -typedef std::shared_ptr AttributeFilterPtr; - -class AttributeRangeFilter; -typedef std::shared_ptr AttributeRangeFilterPtr; - -class CompositeFilter; -typedef std::shared_ptr CompositeFilterPtr; - class AbstractFilter; typedef std::shared_ptr AbstractFilterPtr; typedef std::vector AbstractFilterPtrVector; @@ -77,13 +68,6 @@ class AbstractFilter { FilterType m_filter_type; }; -/** - * Returns NULL shared_ptr if cast is not possible (incorrect type) - */ -AttributeFilterPtr castToAttributeFilter(AbstractFilterPtr from); -AttributeRangeFilterPtr castToAttributeRangeFilter(AbstractFilterPtr from); -CompositeFilterPtr castToCompositeFilter(AbstractFilterPtr from); - // class JSFilterArray : public Common::JSArray { // public: // JSFilterArray(JSContextRef ctx, JSObjectRef array): @@ -127,8 +111,4 @@ class FilterUtils { } // Tizen } // DeviceAPI -#include "AttributeFilter.h" -#include "AttributeRangeFilter.h" -#include "CompositeFilter.h" - #endif // __TIZEN_TIZEN_ABSTRACT_FILTER_H__ diff --git a/src/messaging/MsgCommon/AttributeFilter.cpp b/src/messaging/MsgCommon/AttributeFilter.cpp index 352c0a84..58014d4e 100644 --- a/src/messaging/MsgCommon/AttributeFilter.cpp +++ b/src/messaging/MsgCommon/AttributeFilter.cpp @@ -64,5 +64,14 @@ bool AttributeFilter::isMatching(const FilterableObject *const filtered_object) return filtered_object->isMatchingAttribute(m_attribute_name, m_match_flag, m_match_value); } +AttributeFilterPtr castToAttributeFilter(AbstractFilterPtr from) { + if (ATTRIBUTE_FILTER != from->getFilterType()) { + LoggerE("Trying to get AttributeFilterPtr but filter's type is: %d", from->getFilterType()); + return AttributeFilterPtr(); + } + + return std::dynamic_pointer_cast(from); +} + } // Tizen } // DeviceAPI diff --git a/src/messaging/MsgCommon/AttributeFilter.h b/src/messaging/MsgCommon/AttributeFilter.h index 0f72188c..bd9ceabd 100644 --- a/src/messaging/MsgCommon/AttributeFilter.h +++ b/src/messaging/MsgCommon/AttributeFilter.h @@ -47,6 +47,11 @@ class AttributeFilter : public AbstractFilter { AnyPtr m_match_value; }; +/** + * Returns NULL shared_ptr if cast is not possible (incorrect type) + */ +AttributeFilterPtr castToAttributeFilter(AbstractFilterPtr from); + } // Tizen } // DeviceAPI diff --git a/src/messaging/MsgCommon/AttributeRangeFilter.cpp b/src/messaging/MsgCommon/AttributeRangeFilter.cpp index d3437671..4c063462 100644 --- a/src/messaging/MsgCommon/AttributeRangeFilter.cpp +++ b/src/messaging/MsgCommon/AttributeRangeFilter.cpp @@ -64,5 +64,15 @@ bool AttributeRangeFilter::isMatching(const FilterableObject *const filtered_obj return filtered_object->isMatchingAttributeRange(m_attribute_name, m_initial_value, m_end_value); } +AttributeRangeFilterPtr castToAttributeRangeFilter(AbstractFilterPtr from) { + if (ATTRIBUTE_RANGE_FILTER != from->getFilterType()) { + LoggerE("Trying to get AttributeRangeFilterPtr but filter's type is: %d", + from->getFilterType()); + return AttributeRangeFilterPtr(); + } + + return std::dynamic_pointer_cast(from); +} + } // Tizen } // DeviceAPI diff --git a/src/messaging/MsgCommon/AttributeRangeFilter.h b/src/messaging/MsgCommon/AttributeRangeFilter.h index d847c4cd..6d93cbfe 100644 --- a/src/messaging/MsgCommon/AttributeRangeFilter.h +++ b/src/messaging/MsgCommon/AttributeRangeFilter.h @@ -49,6 +49,12 @@ class AttributeRangeFilter : public AbstractFilter { AnyPtr m_end_value; }; +/** + * Returns NULL shared_ptr if cast is not possible (incorrect type) + */ +AttributeRangeFilterPtr castToAttributeRangeFilter(AbstractFilterPtr from); + + } // Tizen } // DeviceAPI diff --git a/src/messaging/MsgCommon/CompositeFilter.cpp b/src/messaging/MsgCommon/CompositeFilter.cpp index d9b4ff77..275c61c5 100644 --- a/src/messaging/MsgCommon/CompositeFilter.cpp +++ b/src/messaging/MsgCommon/CompositeFilter.cpp @@ -87,5 +87,14 @@ bool CompositeFilter::isMatching(const FilterableObject* const filtered_object) return composite_result; } +CompositeFilterPtr castToCompositeFilter(AbstractFilterPtr from) { + if (COMPOSITE_FILTER != from->getFilterType()) { + LoggerE("Trying to get CompositeFilterPtr but filter's type is: %d", from->getFilterType()); + return CompositeFilterPtr(); + } + + return std::dynamic_pointer_cast(from); +} + } // Tizen } // DeviceAPI diff --git a/src/messaging/MsgCommon/CompositeFilter.h b/src/messaging/MsgCommon/CompositeFilter.h index 3b05b84b..696e75df 100644 --- a/src/messaging/MsgCommon/CompositeFilter.h +++ b/src/messaging/MsgCommon/CompositeFilter.h @@ -44,6 +44,11 @@ class CompositeFilter : public AbstractFilter { AbstractFilterPtrVector m_filters; }; +/** + * Returns NULL shared_ptr if cast is not possible (incorrect type) + */ +CompositeFilterPtr castToCompositeFilter(AbstractFilterPtr from); + } // Tizen } // DeviceAPI diff --git a/src/messaging/email_manager.cc b/src/messaging/email_manager.cc index c207ca1c..65b117cf 100644 --- a/src/messaging/email_manager.cc +++ b/src/messaging/email_manager.cc @@ -315,10 +315,10 @@ void EmailManager::addDraftMessage(MessageCallbackUserData* callback) { } //**** sending email **** -static gboolean sendEmailCompleteCB(void* data) { +static gboolean sendEmailCompleteCB(void* user_data) { ScopeLogger(); - MessageRecipientsCallbackData* callback = static_cast(data); + MessageRecipientsCallbackData* callback = static_cast(user_data); if (!callback) { LoggerE("Callback is null"); return false; diff --git a/src/messaging/message.cc b/src/messaging/message.cc index c983de72..231e0957 100644 --- a/src/messaging/message.cc +++ b/src/messaging/message.cc @@ -1449,25 +1449,26 @@ PlatformResult Message::convertPlatformShortMessageToObject(msg_struct_t msg, MessagingUtil::messageStatusToString(msg_status).c_str()); } else { LoggerE("Couldn't get MSG_MESSAGE_FOLDER_ID_INT, error:%d", error); - error = msg_get_int_value(msg, MSG_SENT_STATUS_NETWORK_STATUS_INT, &infoInt); + int info_network = MSG_NETWORK_NOT_SEND; + error = msg_get_int_value(msg, MSG_SENT_STATUS_NETWORK_STATUS_INT, &info_network); if (MSG_SUCCESS == error) { MessageStatus msg_status; - if (infoInt == MSG_NETWORK_SEND_SUCCESS) { + if (MSG_NETWORK_SEND_SUCCESS == info_network) { msg_status = MessageStatus::STATUS_SENT; - } else if (infoInt == MSG_NETWORK_SENDING) { + } else if (MSG_NETWORK_SENDING == info_network) { msg_status = MessageStatus::STATUS_SENDING; - } else if (infoInt == MSG_NETWORK_SEND_FAIL) { + } else if (MSG_NETWORK_SEND_FAIL == info_network) { msg_status = MessageStatus::STATUS_FAILED; - } else if (infoInt == MSG_NETWORK_NOT_SEND) { + } else if (MSG_NETWORK_NOT_SEND == info_network) { msg_status = MessageStatus::STATUS_DRAFT; } else { - LoggerW("warning undefined messageStatus: %d!", infoInt); + LoggerW("warning undefined messageStatus: %d!", info_network); msg_status = MessageStatus::STATUS_UNDEFINED; } message->setMessageStatus(msg_status); - LoggerD("MSG_SENT_STATUS_NETWORK_STATUS:%d MessageStatus:%s", infoInt, + LoggerD("MSG_SENT_STATUS_NETWORK_STATUS:%d MessageStatus:%s", info_network, MessagingUtil::messageStatusToString(msg_status).c_str()); } else { LoggerE("Couldn't get MSG_SENT_STATUS_NETWORK_STATUS_INT, error:%d", error); diff --git a/src/messaging/messaging_database_manager.h b/src/messaging/messaging_database_manager.h index a2414925..dd469915 100644 --- a/src/messaging/messaging_database_manager.h +++ b/src/messaging/messaging_database_manager.h @@ -22,7 +22,9 @@ #include #include -#include "MsgCommon/AbstractFilter.h" +#include "MsgCommon/AttributeFilter.h" +#include "MsgCommon/AttributeRangeFilter.h" +#include "MsgCommon/CompositeFilter.h" #include "common/platform_result.h" #include "find_msg_callback_user_data.h" diff --git a/src/messaging/messaging_util.cc b/src/messaging/messaging_util.cc index d919911c..e4b17e79 100644 --- a/src/messaging/messaging_util.cc +++ b/src/messaging/messaging_util.cc @@ -1001,14 +1001,14 @@ PlatformResult MessagingUtil::jsonFilterToCompositeFilter(const picojson::object auto compositeFilter = new CompositeFilter(filterType); for (const auto& a : filter.at(JSON_TO_FILTER_ARRAY).get()) { - AbstractFilterPtr filter; - PlatformResult ret = jsonFilterToAbstractFilter(a.get(), &filter); + AbstractFilterPtr filter_ptr; + PlatformResult ret = jsonFilterToAbstractFilter(a.get(), &filter_ptr); if (ret.IsError()) { delete compositeFilter; LoggerD("Convert JSON filter to Abstract filter failed (%s)", ret.message().c_str()); return ret; } - compositeFilter->addFilter(filter); + compositeFilter->addFilter(filter_ptr); } (*result).reset(compositeFilter); diff --git a/src/messaging/messaging_util.h b/src/messaging/messaging_util.h index 7ccd031a..996a5b8f 100644 --- a/src/messaging/messaging_util.h +++ b/src/messaging/messaging_util.h @@ -27,8 +27,9 @@ #include "common/picojson.h" #include "common/platform_result.h" -#include "MsgCommon/AbstractFilter.h" #include "MsgCommon/AttributeFilter.h" +#include "MsgCommon/AttributeRangeFilter.h" +#include "MsgCommon/CompositeFilter.h" #include "MsgCommon/SortMode.h" #include "common/platform_result.h" diff --git a/src/messaging/short_message_manager.cc b/src/messaging/short_message_manager.cc index 050971f5..d1fc95ce 100644 --- a/src/messaging/short_message_manager.cc +++ b/src/messaging/short_message_manager.cc @@ -39,10 +39,10 @@ using common::PlatformResult; namespace extension { namespace messaging { -static gboolean sendMessageCompleteCB(void* data) { - ScopeLogger("callback:%p", data); +static gboolean sendMessageCompleteCB(void* user_data) { + ScopeLogger("callback: %p", user_data); - MessageRecipientsCallbackData* callback = static_cast(data); + MessageRecipientsCallbackData* callback = static_cast(user_data); if (!callback) { LoggerE("Callback is null"); return false; diff --git a/src/voicecontrol/voicecontrol_client.cc b/src/voicecontrol/voicecontrol_client.cc index e70976b6..5659a1b7 100644 --- a/src/voicecontrol/voicecontrol_client.cc +++ b/src/voicecontrol/voicecontrol_client.cc @@ -142,13 +142,13 @@ common::PlatformResult VoiceControlClient::RemoveLanguageChangeListener() { return MakeErrorObject(VC_ERROR_NONE); } -const bool VoiceControlClient::IsResultListenerSet() { +bool VoiceControlClient::IsResultListenerSet() { ScopeLogger(); return is_result_cb_set; } -const bool VoiceControlClient::IsLanguageChangedListenerSet() { +bool VoiceControlClient::IsLanguageChangedListenerSet() { ScopeLogger(); return is_lang_cb_set; diff --git a/src/voicecontrol/voicecontrol_client.h b/src/voicecontrol/voicecontrol_client.h index 117d99c8..952d3348 100644 --- a/src/voicecontrol/voicecontrol_client.h +++ b/src/voicecontrol/voicecontrol_client.h @@ -37,8 +37,8 @@ class VoiceControlClient { common::PlatformResult AddLanguageChangeListener(); common::PlatformResult RemoveLanguageChangeListener(); - const bool IsResultListenerSet(); - const bool IsLanguageChangedListenerSet(); + bool IsResultListenerSet(); + bool IsLanguageChangedListenerSet(); private: bool is_result_cb_set; diff --git a/src/widgetservice/widgetservice_instance.cc b/src/widgetservice/widgetservice_instance.cc index 51545543..fd8f0baa 100644 --- a/src/widgetservice/widgetservice_instance.cc +++ b/src/widgetservice/widgetservice_instance.cc @@ -586,9 +586,9 @@ TizenResult WidgetServiceInstance::SendContent(picojson::object const& args) { LogAndReturnTizenError(common::AbortError(ret), ("bundle_add() failed")); } - ret = widget_service_trigger_update(widget_id.c_str(), instance_id.c_str(), data, force); - if (WIDGET_ERROR_NONE != ret) { - LogAndReturnTizenError(WidgetServiceUtils::ConvertErrorCode(ret), + int ret_widget = widget_service_trigger_update(widget_id.c_str(), instance_id.c_str(), data, force); + if (WIDGET_ERROR_NONE != ret_widget) { + LogAndReturnTizenError(WidgetServiceUtils::ConvertErrorCode(ret_widget), ("widget_service_trigger_update() failed")); } @@ -620,11 +620,11 @@ TizenResult WidgetServiceInstance::GetContent(picojson::object const& args, bundle_free(bundle_data); }; - ret = widget_service_get_content_of_widget_instance(widget_id.c_str(), instance_id.c_str(), + int ret_widget = widget_service_get_content_of_widget_instance(widget_id.c_str(), instance_id.c_str(), &bundle_data); - if (WIDGET_ERROR_NONE != ret) { + if (WIDGET_ERROR_NONE != ret_widget) { LoggerE("widget_service_get_content_of_widget_instance() failed"); - this->Post(token, WidgetServiceUtils::ConvertErrorCode(ret)); + this->Post(token, WidgetServiceUtils::ConvertErrorCode(ret_widget)); return; }