diff --git a/ability/common/utils/src/merge_utils.cpp b/ability/common/utils/src/merge_utils.cpp index 5dec2a0..0c33ea7 100644 --- a/ability/common/utils/src/merge_utils.cpp +++ b/ability/common/utils/src/merge_utils.cpp @@ -65,7 +65,7 @@ std::set MergeUtils::QueryDataExecute( { std::set result; unsigned int size = rawIds.size(); - if (size <= 0) { + if (size < 1) { return result; } std::string query = "SELECT "; diff --git a/ability/common/utils/src/uri_utils.cpp b/ability/common/utils/src/uri_utils.cpp index 6e7fbb6..3064798 100644 --- a/ability/common/utils/src/uri_utils.cpp +++ b/ability/common/utils/src/uri_utils.cpp @@ -38,8 +38,8 @@ std::map UriUtils::getQueryParameter(OHOS::Uri &uri) unsigned int size = tempVector.size(); for (unsigned int i = 0; i < size; i++) { std::vector childTempVector = split(tempVector[i], "="); - size_t size = childTempVector.size(); - if (size != REQUEST_PARAMS_NUM) { + size_t childSize = childTempVector.size(); + if (childSize != REQUEST_PARAMS_NUM) { HILOG_ERROR("UriUtils uriParse getQueryParameter query parameter error"); break; } diff --git a/ability/datadisasterrecovery/src/database_disaster_recovery.cpp b/ability/datadisasterrecovery/src/database_disaster_recovery.cpp index 48dfe0c..545ba0f 100644 --- a/ability/datadisasterrecovery/src/database_disaster_recovery.cpp +++ b/ability/datadisasterrecovery/src/database_disaster_recovery.cpp @@ -53,7 +53,6 @@ DataBaseDisasterRecovery::~DataBaseDisasterRecovery() int DataBaseDisasterRecovery::SQLiteCheckDb() { g_mtx.lock(); - int ret = OPERATION_ERROR; HILOG_INFO("DataBaseDisasterRecovery SQLliteCheck start."); redbStoreMap.clear(); if (redbStoreMap.empty()) { @@ -70,7 +69,7 @@ int DataBaseDisasterRecovery::SQLiteCheckDb() } for (auto &kv : redbStoreMap) { std::shared_ptr store_ = kv.second; - ret = SQLiteCheckDb(store_, kv.first); + int ret = SQLiteCheckDb(store_, kv.first); if (ret != OHOS::NativeRdb::E_OK) { HILOG_ERROR("DataBaseDisasterRecovery SQLiteCheckDb ERROR."); g_mtx.unlock(); diff --git a/ability/merge/src/merger_contacts.cpp b/ability/merge/src/merger_contacts.cpp index 7871f66..c10a083 100644 --- a/ability/merge/src/merger_contacts.cpp +++ b/ability/merge/src/merger_contacts.cpp @@ -200,7 +200,7 @@ void MergerContacts::UpdateRawContactsExecute( std::shared_ptr store, int minContactId, std::set Ids) { unsigned int size = Ids.size(); - if (size < 0) { + if (size < 1) { return; } std::string updateRawContact = "UPDATE "; diff --git a/dataBusiness/calllog/src/calllog_ability.cpp b/dataBusiness/calllog/src/calllog_ability.cpp index 4b5da04..acb41e9 100644 --- a/dataBusiness/calllog/src/calllog_ability.cpp +++ b/dataBusiness/calllog/src/calllog_ability.cpp @@ -192,7 +192,7 @@ int CallLogAbility::BatchInsert(const Uri &uri, const std::vectorBeginTransaction(); @@ -189,7 +188,7 @@ int ContactsDataAbility::Insert(const Uri &uri, const DataShare::DataShareValues g_mutex.unlock(); return Contacts::RDB_EXECUTE_FAIL; } - resultId = InsertExecute(code, valuesBucket); + int resultId = InsertExecute(code, valuesBucket); HILOG_INFO("Insert id = %{public}d", resultId); if (resultId == Contacts::OPERATION_ERROR) { contactDataBase_->RollBack(); @@ -251,7 +250,7 @@ int ContactsDataAbility::InsertExecute(int &code, const OHOS::NativeRdb::ValuesB int ContactsDataAbility::BatchInsert(const Uri &uri, const std::vector &values) { unsigned int size = values.size(); - if (size <= 0) { + if (size < 1) { return Contacts::RDB_EXECUTE_FAIL; } g_mutex.lock(); diff --git a/dataBusiness/voicemail/src/voicemail_ability.cpp b/dataBusiness/voicemail/src/voicemail_ability.cpp index f1a3f0d..05f9f16 100644 --- a/dataBusiness/voicemail/src/voicemail_ability.cpp +++ b/dataBusiness/voicemail/src/voicemail_ability.cpp @@ -137,13 +137,12 @@ int VoiceMailAbility::Insert(const Uri &uri, const DataShare::DataShareValuesBuc } g_mutex.lock(); voiceMailDataBase_ = Contacts::VoiceMailDataBase::GetInstance(); - int rowRet = Contacts::RDB_EXECUTE_FAIL; int ret = voiceMailDataBase_->BeginTransaction(); if (!IsBeginTransactionOK(ret, g_mutex)) { g_mutex.unlock(); return Contacts::RDB_EXECUTE_FAIL; } - rowRet = InsertExecute(uri, valuesBucket); + int rowRet = InsertExecute(uri, valuesBucket); if (rowRet == Contacts::OPERATION_ERROR) { voiceMailDataBase_->RollBack(); g_mutex.unlock(); @@ -197,7 +196,7 @@ int VoiceMailAbility::InsertExecute(const OHOS::Uri &uri, const OHOS::NativeRdb: int VoiceMailAbility::BatchInsert(const Uri &uri, const std::vector &values) { unsigned int size = values.size(); - if (size <= 0) { + if (size < 1) { return Contacts::RDB_EXECUTE_FAIL; } g_mutex.lock();