From: Anna Niznik Date: Tue, 21 Jul 2015 12:05:53 +0000 (+0200) Subject: Removing warnings from modules: callhistory, common, datacontrol. X-Git-Tag: submit/tizen/20151026.073646^2^2~225 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fc9f91b28767644e545b97faac767ff1a875f552;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git Removing warnings from modules: callhistory, common, datacontrol. Using cppcheck (with --enable=all flag). [Verification] TCT result: Before: [callhistory] 100.00% [datacontrol] 100.00% After: [callhistory] 100.00% [datacontrol] 100.00% Change-Id: I8220e3b87baa05db5a4cd28d18e9b43209f95b0a Signed-off-by: Anna Niznik --- diff --git a/src/callhistory/callhistory.cc b/src/callhistory/callhistory.cc index 6e6b74af..7a6c7260 100755 --- a/src/callhistory/callhistory.cc +++ b/src/callhistory/callhistory.cc @@ -178,8 +178,7 @@ void CallHistory::FindThread(const picojson::object& args, CallHistory* call_his contacts_list_destroy(record_list, true); }; - int ret = CONTACTS_ERROR_NONE; - ret = contacts_connect_on_thread(); + int ret = contacts_connect_on_thread(); if (CONTACTS_ERROR_NONE != ret) { LoggerW("contacts_connect_on_thread failed"); } @@ -378,10 +377,9 @@ common::PlatformResult CallHistory::removeBatch(const picojson::object& args) return; } - int uid; int ret = CONTACTS_ERROR_NONE; for (unsigned int i = 0; i < uids.size(); ++i) { - uid = atoi(uids[i].get().c_str()); + int uid = atoi(uids[i].get().c_str()); ret = contacts_db_delete_record(_contacts_phone_log._uri, (int)uid); if (CONTACTS_ERROR_NONE != ret) { LoggerE("Failed to delete log [%d] with code %d", uid, ret); @@ -423,12 +421,11 @@ void CallHistory::removeAll(const picojson::object& args) }; contacts_record_h record = NULL; - int ret = CONTACTS_ERROR_NONE; int total = 0; int value; unsigned int cnt = 0; - ret = contacts_connect_on_thread(); + int ret = contacts_connect_on_thread(); if (CONTACTS_ERROR_NONE != ret) { LoggerW("contacts_connect_on_thread failed"); } @@ -547,8 +544,6 @@ void CallHistory::changeListenerCB(const char* view_uri, char *changes, void* us char seps[] = ",:"; char* token_type = NULL; - char* token_id = NULL; - int change_type = 0; int change_id = 0; picojson::value added = picojson::value(picojson::object()); @@ -570,8 +565,8 @@ void CallHistory::changeListenerCB(const char* view_uri, char *changes, void* us token_type = strtok_r(changes, seps, &saveptr); while (NULL != token_type) { - token_id = strtok_r(NULL, seps, &saveptr); - change_type = atoi((const char*)token_type); + char* token_id = strtok_r(NULL, seps, &saveptr); + int change_type = atoi((const char*)token_type); if (NULL != token_id) { change_id = atoi((const char*)token_id); @@ -583,14 +578,13 @@ void CallHistory::changeListenerCB(const char* view_uri, char *changes, void* us contacts_query_h query = NULL; contacts_filter_h filter = NULL; contacts_list_h record_list = NULL; - int ret = CONTACTS_ERROR_NONE; contacts_query_create(_contacts_phone_log._uri, &query); contacts_filter_create(_contacts_phone_log._uri, &filter); contacts_filter_add_int(filter, _contacts_phone_log.id, CONTACTS_MATCH_EQUAL, change_id); contacts_query_set_filter(query, filter); - ret = contacts_query_set_sort(query, _contacts_phone_log.id, false); + int ret = contacts_query_set_sort(query, _contacts_phone_log.id, false); if (CONTACTS_ERROR_NONE != ret) { LoggerD("Callhistory query error: %d", ret); } @@ -692,10 +686,9 @@ PlatformResult CallHistory::setMissedDirection(int uid) contacts_record_destroy(record, true); }; - int ret = CONTACTS_ERROR_NONE; int log_type = CONTACTS_PLOG_TYPE_NONE; - ret = contacts_db_get_record(_contacts_phone_log._uri, uid, &record); + int ret = contacts_db_get_record(_contacts_phone_log._uri, uid, &record); if (CONTACTS_ERROR_NONE != ret) { LoggerE("Failed to get record [%d]", ret); return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to get record"); diff --git a/src/callhistory/callhistory_utils.cc b/src/callhistory/callhistory_utils.cc index b23404f2..70dcb50c 100755 --- a/src/callhistory/callhistory_utils.cc +++ b/src/callhistory/callhistory_utils.cc @@ -49,11 +49,10 @@ void CallHistoryUtils::parseRecordList(contacts_list_h *record_list, picojson::a { LoggerD("Entered"); - int ret = CONTACTS_ERROR_NONE; contacts_record_h record = NULL; int total = 0; - ret = contacts_list_get_count(*record_list, &total); + int ret = contacts_list_get_count(*record_list, &total); if (CONTACTS_ERROR_NONE != ret) { LoggerW("Failed to get contacts list: %d", ret); return; @@ -84,10 +83,9 @@ void CallHistoryUtils::parseRecord(contacts_record_h *record, picojson::object& { LoggerD("Entered"); - int ret = CONTACTS_ERROR_NONE; int int_data; - ret = contacts_record_get_int(*record, _contacts_phone_log.id, &int_data); + int ret = contacts_record_get_int(*record, _contacts_phone_log.id, &int_data); if (CONTACTS_ERROR_NONE != ret) { LoggerD("Failed to get contacts phone log id: %d", ret); } else { @@ -201,7 +199,6 @@ void CallHistoryUtils::parseRemoteParties(contacts_record_h *record, picojson::o { LoggerD("Entered"); - int ret = CONTACTS_ERROR_NONE; char * char_data = NULL; int int_data; @@ -210,7 +207,7 @@ void CallHistoryUtils::parseRemoteParties(contacts_record_h *record, picojson::o remote_parties.push_back(picojson::value(picojson::object())); picojson::object& parties_obj = remote_parties.back().get(); - ret = contacts_record_get_int(*record, _contacts_phone_log.person_id, &int_data); + int ret = contacts_record_get_int(*record, _contacts_phone_log.person_id, &int_data); if (CONTACTS_ERROR_NONE != ret) { LoggerD("Failed to get contacts phone log person id: %d", ret); } else { @@ -229,12 +226,11 @@ void CallHistoryUtils::parseCallingParty(contacts_record_h *record, picojson::ob { LoggerD("Entered"); - int ret = CONTACTS_ERROR_NONE; const std::vector& phone_numbers = history_.getPhoneNumbers(); int sim_count = phone_numbers.size(); int sim_index; - ret = contacts_record_get_int(*record, _contacts_phone_log.sim_slot_no, &sim_index); + int ret = contacts_record_get_int(*record, _contacts_phone_log.sim_slot_no, &sim_index); if (CONTACTS_ERROR_NONE != ret) { LoggerW("Failed to get sim slot no. %d", ret); } @@ -246,7 +242,7 @@ void CallHistoryUtils::parseCallingParty(contacts_record_h *record, picojson::ob } } -unsigned int CallHistoryUtils::convertAttributeName(const std::string attribute_name) +unsigned int CallHistoryUtils::convertAttributeName(const std::string& attribute_name) { LoggerD("Entered"); diff --git a/src/callhistory/callhistory_utils.h b/src/callhistory/callhistory_utils.h index 3a3fbcd8..9c9699ce 100755 --- a/src/callhistory/callhistory_utils.h +++ b/src/callhistory/callhistory_utils.h @@ -36,7 +36,7 @@ class CallHistoryUtils { void parseLogType(contacts_phone_log_type_e log_type, picojson::object& obj); void parseRemoteParties(contacts_record_h *record, picojson::object& obj); void parseCallingParty(contacts_record_h *record, picojson::object& obj); - unsigned int convertAttributeName(const std::string attribute_name); + unsigned int convertAttributeName(const std::string& attribute_name); void createFilter(contacts_filter_h filter, const picojson::object filter_obj); private: diff --git a/src/common/dbus_operation.cc b/src/common/dbus_operation.cc index 1cb58535..3e027e60 100755 --- a/src/common/dbus_operation.cc +++ b/src/common/dbus_operation.cc @@ -342,7 +342,7 @@ PlatformResult DBusOperation::UnregisterSignalListener(const std::string& signal return PlatformResult(ErrorCode::UNKNOWN_ERR, "Failed to find signal handler"); } - if (listeners_.size() == 0) { + if (listeners_.empty()) { return RemoveDBusSignalFilter(); } return PlatformResult(ErrorCode::NO_ERROR); diff --git a/src/common/tools.cc b/src/common/tools.cc index 1271b7c8..252bcd56 100644 --- a/src/common/tools.cc +++ b/src/common/tools.cc @@ -144,9 +144,8 @@ class AccessControlImpl { bool CheckAccess(const std::vector& privileges) { LoggerD("Enter"); - int ret = 0; for (size_t i = 0; i < privileges.size(); ++i) { - ret = privilege_checker_check_privilege(privileges[i].c_str()); + int ret = privilege_checker_check_privilege(privileges[i].c_str()); if (PRIVILEGE_CHECKER_ERR_NONE != ret) { return false; } diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc index e0717687..dfc84636 100755 --- a/src/datacontrol/datacontrol_instance.cc +++ b/src/datacontrol/datacontrol_instance.cc @@ -304,8 +304,6 @@ static void SQLSelectResponseCallback(int requestId, data_control_h handle, picojson::value value; if (SQLColumnName(cursor, i, column) && SQLColumnValue(cursor, i, value)) { - std::string& name = column.get(); - std::string& val = value.get(); columns.push_back(column); values.push_back(value); } @@ -505,9 +503,6 @@ void DatacontrolInstance::DataControlManagerGetdatacontrolconsumer( LoggerD("Enter"); CHECK_EXIST(args, "providerId", out) CHECK_EXIST(args, "dataId", out) - - const std::string& providerId = args.get("providerId").get(); - const std::string& dataId = args.get("dataId").get(); } void DatacontrolInstance::SQLDataControlConsumerInsert( const picojson::value& args, picojson::object& out) {