openharmony/device_profile_core
1
0
Fork 0
mirror of https://github.com/openharmony/device_profile_core.git synced 2026-07-19 17:05:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

!52 sync code review fixes

Browse Source 
Merge pull request !52 from Gymee/code_review
This commit is contained in:
openharmony_ci
2022-03-16 08:16:04 +00:00
committed by Gitee
parent 8fa4d775ee e6ff801c98
commit 659baaf0fa
10 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
interfaces/innerkits/core/src/distributed_device_profile_client.cpp
+4 -6
View File
@@ -241,14 +241,12 @@ void DistributedDeviceProfileClient::MergeSubscribeInfoLocked(std::list<Subscrib
[&newSubscribeInfo](const auto& subscribeInfo) {
return subscribeInfo.profileEvent == newSubscribeInfo.profileEvent;
});
if (iter != subscribeInfos.end()) {
if (iter == subscribeInfos.end()) {
subscribeInfos.emplace_back(newSubscribeInfo);
continue;
}
// override with the new suscribe info for same profile event
if (*iter != newSubscribeInfo) {
*iter = newSubscribeInfo;
}
// override with the new subscribe info for same profile event
*iter = newSubscribeInfo;
}
}
@@ -301,4 +299,4 @@ void DistributedDeviceProfileClient::DeviceProfileDeathRecipient::OnRemoteDied(c
DistributedDeviceProfileClient::GetInstance().OnServiceDied(remote.promote());
}
} // namespace DeviceProfile
} // namespace OHOS
} // namespace OHOS
interfaces/innerkits/core/src/distributed_device_profile_proxy.cpp
+4 -4
View File
@@ -68,7 +68,7 @@ int32_t DistributedDeviceProfileProxy::DeleteDeviceProfile(const std::string& se
sptr<IRemoteObject> remote = Remote();
MessageParcel data;
if (!data.WriteInterfaceToken(IDistributedDeviceProfile::GetDescriptor())) {
HILOGE("write inteface token failed");
HILOGE("write interface token failed");
return ERR_FLATTEN_OBJECT;
}
PARCEL_WRITE_HELPER(data, String, serviceId);
@@ -84,7 +84,7 @@ int32_t DistributedDeviceProfileProxy::SubscribeProfileEvents(
sptr<IRemoteObject> remote = Remote();
MessageParcel data;
if (!data.WriteInterfaceToken(IDistributedDeviceProfile::GetDescriptor())) {
HILOGE("write inteface token failed");
HILOGE("write interface token failed");
return ERR_FLATTEN_OBJECT;
}
size_t size = subscribeInfos.size();
@@ -116,7 +116,7 @@ int32_t DistributedDeviceProfileProxy::UnsubscribeProfileEvents(
sptr<IRemoteObject> remote = Remote();
MessageParcel data;
if (!data.WriteInterfaceToken(IDistributedDeviceProfile::GetDescriptor())) {
HILOGE("write inteface token failed");
HILOGE("write interface token failed");
return ERR_FLATTEN_OBJECT;
}
if (!DeviceProfileUtils::WriteProfileEvents(profileEvents, data)) {
@@ -142,7 +142,7 @@ int32_t DistributedDeviceProfileProxy::SyncDeviceProfile(const SyncOptions& sync
sptr<IRemoteObject> remote = Remote();
MessageParcel data;
if (!data.WriteInterfaceToken(IDistributedDeviceProfile::GetDescriptor())) {
HILOGE("write inteface token failed");
HILOGE("write interface token failed");
return ERR_FLATTEN_OBJECT;
}
interfaces/innerkits/core/src/profile_event_notifier_stub.cpp
+1 -1
View File
@@ -39,7 +39,7 @@ ProfileEventNotifierStub::HandlersMap ProfileEventNotifierStub::InitHandlersMap(
int32_t ProfileEventNotifierStub::OnRemoteRequest(uint32_t code, MessageParcel& data,
MessageParcel& reply, MessageOption& option)
{
HILOGI("code = %{public}d", code);
HILOGI("code = %{public}u", code);
std::u16string descriptor = ProfileEventNotifierStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {
services/core/src/authority/trust_group_manager.cpp
+2 -2
View File
@@ -69,12 +69,12 @@ bool TrustGroupManager::CheckTrustGroup(const std::string& deviceId)
int32_t ret = hichainGmInstance_->getRelatedGroups(ANY_OS_ACCOUNT, AUTH_APPID.c_str(), deviceId.c_str(),
&returnGroups, &groupNum);
if (ret != ERR_OK) {
HILOGE("faild , ret: %d", ret);
HILOGE("failed, ret:%{public}d", ret);
return false;
}
if (returnGroups == nullptr || groupNum == 0) {
HILOGE("faild, returnGroups is nullptr");
HILOGE("failed, returnGroups is nullptr");
return false;
}
services/core/src/dbstorage/sync_coordinator.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ bool SyncCoordinator::Init()
bool SyncCoordinator::AcquireSync()
{
if (isOnSync_) {
HILOGI("acquire from %{publiic}s", isOnlineTrigger_ ? "online" : "manual");
HILOGI("acquire from %{public}s", isOnlineTrigger_ ? "online" : "manual");
return false;
}
isOnSync_ = true;
@@ -72,4 +72,4 @@ bool SyncCoordinator::DispatchSyncTask(const SyncTask& syncTask, int64_t delayTi
return true;
}
} // namespace DeviceProfile
} // namespace OHOS
} // namespace OHOS
services/core/src/distributed_device_profile_stub.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ bool DistributedDeviceProfileStub::EnforceInterfaceToken(MessageParcel& data)
int32_t DistributedDeviceProfileStub::OnRemoteRequest(uint32_t code, MessageParcel& data,
MessageParcel& reply, MessageOption& option)
{
HILOGI("code = %{public}d, flags = %{public}d", code, option.GetFlags());
HILOGI("code = %{public}u, flags = %{public}d", code, option.GetFlags());
auto iter = funcsMap_.find(code);
if (iter != funcsMap_.end()) {
services/core/src/subscribemanager/profile_change_handler.cpp
+4 -1
View File
@@ -57,6 +57,9 @@ std::unique_ptr<ProfileKey> ProfileKey::Parse(const std::string& entryKey)
int32_t index = 0;
auto profileKey = std::make_unique<ProfileKey>();
if (profileKey == nullptr) {
return nullptr;
}
profileKey->udid = std::move(vec[index++]);
if (profileKey->udid.size() != DEVICE_ID_SIZE) {
HILOGE("parse udid failed");
@@ -191,7 +194,7 @@ void ProfileChangeHandler::NotifyProfileChangedLocked(const ProfileChangeNotific
for (auto index : indexes) {
filteredEntries.emplace_back(profileEntries[index]);
}
HILOGI("filtered with %{public}zu entrie(s)", size);
HILOGI("filtered with %{public}zu entries", size);
bool isLocal = changeNotification.IsLocal();
std::string deviceId = changeNotification.GetDeviceId();
ProfileChangeNotification filteredNotification(filteredEntries, deviceId, isLocal);
services/core/test/unittest/event_subscribe_test.cpp
+1 -1
View File
@@ -421,7 +421,7 @@ HWTEST_F(EventSubscribeTest, SubscribeWithUnsusbscribe002, TestSize.Level2)
}
/**
* @tc.steps: step4. put a other subscribed service profile
* @tc.steps: step4. put a subscribed service profile
* @tc.expected: step4. can't receive notification.
*/
errCode = PutFakeStorage();
services/core/test/unittest/profile_authority_test.cpp
+3 -3
View File
@@ -119,7 +119,7 @@ HWTEST_F(ProfileAuthorityTest, CheckAuthority_003, TestSize.Level0)
/**
* @tc.name: CheckAuthority_004
* @tc.desc: check authority of a empty serviceId
* @tc.desc: check authority of an empty serviceId
* @tc.type: FUNC
*/
HWTEST_F(ProfileAuthorityTest, CheckAuthority_004, TestSize.Level0)
@@ -173,7 +173,7 @@ HWTEST_F(ProfileAuthorityTest, CheckAuthority_006, TestSize.Level0)
/**
* @tc.name: CheckAuthority_007
* @tc.desc: check authority of mulitiple serviceIds
* @tc.desc: check authority of multiple serviceIds
* @tc.type: FUNC
*/
HWTEST_F(ProfileAuthorityTest, CheckAuthority_007, TestSize.Level0)
@@ -206,4 +206,4 @@ HWTEST_F(ProfileAuthorityTest, CheckAuthority_008, TestSize.Level0)
EXPECT_FALSE(AuthorityManager::GetInstance().CheckInterfaceAuthority(""));
}
}
}
}
tools/dp/src/dp_command.cpp
+1 -1
View File
@@ -78,7 +78,7 @@ ErrCode DpShellCommand::HelpCommand()
ErrCode DpShellCommand::GetDeviceCommand()
{
resultReceiver_.append("[remote device list]\n");
NodeBasicInfo *info = NULL;
NodeBasicInfo *info = nullptr;
int32_t infoNum = 0;
int32_t ret = GetAllNodeDeviceInfo("dp", &info, &infoNum);
if (ret != ERR_OK) {