openharmony/applications_contactsdata
1
0
Fork 0
mirror of https://github.com/openharmony/applications_contactsdata.git synced 2026-07-01 20:24:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

codex fix

Browse Source 
Signed-off-by: jiangbinghan <jiangbinghan@huawei.com>
This commit is contained in:
jiangbinghan
2023-03-31 17:30:47 +08:00
parent c55bf85694
commit 744886cead
7 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ability/common/utils/src/merge_utils.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ std::set<std::string> MergeUtils::QueryDataExecute(
{
std::set<std::string> result;
unsigned int size = rawIds.size();
if (size <= 0) {
if (size < 1) {
return result;
}
std::string query = "SELECT ";
ability/common/utils/src/uri_utils.cpp
+2 -2
View File
@@ -38,8 +38,8 @@ std::map<std::string, std::string> UriUtils::getQueryParameter(OHOS::Uri &uri)
unsigned int size = tempVector.size();
for (unsigned int i = 0; i < size; i++) {
std::vector<std::string> 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;
}
ability/datadisasterrecovery/src/database_disaster_recovery.cpp
+1 -2
View File
@@ -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<OHOS::NativeRdb::RdbStore> 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();
ability/merge/src/merger_contacts.cpp
+1 -1
View File
@@ -200,7 +200,7 @@ void MergerContacts::UpdateRawContactsExecute(
std::shared_ptr<OHOS::NativeRdb::RdbStore> store, int minContactId, std::set<int> Ids)
{
unsigned int size = Ids.size();
if (size < 0) {
if (size < 1) {
return;
}
std::string updateRawContact = "UPDATE ";
dataBusiness/calllog/src/calllog_ability.cpp
+1 -1
View File
@@ -192,7 +192,7 @@ int CallLogAbility::BatchInsert(const Uri &uri, const std::vector<DataShare::Dat
{
int rowRet = Contacts::RDB_EXECUTE_FAIL;
unsigned int size = values.size();
if (size <= 0) {
if (size < 1) {
HILOG_ERROR("BatchInsert value is error");
return rowRet;
}
dataBusiness/contacts/src/contacts_data_ability.cpp
+2 -3
View File
@@ -181,7 +181,6 @@ int ContactsDataAbility::Insert(const Uri &uri, const DataShare::DataShareValues
g_mutex.lock();
contactDataBase_ = Contacts::ContactsDataBase::GetInstance();
profileDataBase_ = Contacts::ProfileDatabase::GetInstance();
int resultId = Contacts::RDB_EXECUTE_FAIL;
OHOS::Uri uriTemp = uri;
int code = UriParseAndSwitch(uriTemp);
int ret = contactDataBase_->BeginTransaction();
@@ -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<DataShare::DataShareValuesBucket> &values)
{
unsigned int size = values.size();
if (size <= 0) {
if (size < 1) {
return Contacts::RDB_EXECUTE_FAIL;
}
g_mutex.lock();
dataBusiness/voicemail/src/voicemail_ability.cpp
+2 -3
View File
@@ -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<DataShare::DataShareValuesBucket> &values)
{
unsigned int size = values.size();
if (size <= 0) {
if (size < 1) {
return Contacts::RDB_EXECUTE_FAIL;
}
g_mutex.lock();