openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/ability_ability_runtime synced 2024-11-23 15:20:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1119 修复内源检视问题

Browse Source 
Merge pull request !1119 from jerry/master
This commit is contained in:
openharmony_ci 2022-03-10 09:18:11 +00:00 committed by Gitee
commit 60d0d6ef34
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
18 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/kits/ability/native/src/continuation/distributed/reverse_continuation_scheduler_replica_stub.cpp
View File

@ -58,7 +58,7 @@ int32_t ReverseContinuationSchedulerReplicaStub::NotifyReverseResultInner(Messag
int ReverseContinuationSchedulerReplicaStub::OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("%{public}s called begin, code = %{public}d, flags= %{public}d.", __func__, code, option.GetFlags());
HILOG_INFO("%{public}s called begin, code = %{public}u, flags= %{public}d.", __func__, code, option.GetFlags());
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (remoteDescriptor != ReverseContinuationSchedulerReplicaStub::GetDescriptor()) {
HILOG_ERROR("ReverseContinuationSchedulerReplicaStub::OnRemoteRequest token is invalid");

2
interfaces/innerkits/app_manager/src/appmgr/ability_controller_stub.cpp
View File

@ -39,7 +39,7 @@ AbilityControllerStub::~AbilityControllerStub()
int AbilityControllerStub::OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("AbilityControllerStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("AbilityControllerStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = AbilityControllerStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/ams_mgr_stub.cpp
View File

@ -76,7 +76,7 @@ AmsMgrStub::~AmsMgrStub()
int AmsMgrStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("AmsMgrStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("AmsMgrStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = AmsMgrStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/app_mgr_stub.cpp
View File

@ -85,7 +85,7 @@ AppMgrStub::~AppMgrStub()
int AppMgrStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("AppMgrStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("AppMgrStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = AppMgrStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/app_scheduler_host.cpp
View File

@ -59,7 +59,7 @@ AppSchedulerHost::~AppSchedulerHost()
int AppSchedulerHost::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("AppSchedulerHost::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("AppSchedulerHost::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = AppSchedulerHost::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/app_state_callback_host.cpp
View File

@ -41,7 +41,7 @@ AppStateCallbackHost::~AppStateCallbackHost()
int AppStateCallbackHost::OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("AppStateCallbackHost::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("AppStateCallbackHost::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = AppStateCallbackHost::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/application_state_observer_stub.cpp
View File

@ -52,7 +52,7 @@ ApplicationStateObserverStub::~ApplicationStateObserverStub()
int ApplicationStateObserverStub::OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("ApplicationStateObserverStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("ApplicationStateObserverStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = ApplicationStateObserverStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/render_scheduler_host.cpp
View File

@ -34,7 +34,7 @@ RenderSchedulerHost::~RenderSchedulerHost()
int RenderSchedulerHost::OnRemoteRequest(uint32_t code, MessageParcel &data,
MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("RenderSchedulerHost::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("RenderSchedulerHost::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = RenderSchedulerHost::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/app_manager/src/appmgr/start_specified_ability_response_stub.cpp
View File

@ -65,7 +65,7 @@ int32_t StartSpecifiedAbilityResponseStub::HandleOnTimeoutResponse(MessageParcel
int StartSpecifiedAbilityResponseStub::OnRemoteRequest(
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("StartSpecifiedAbilityResponseStub::OnReceived, code = %{public}d, flags= %{public}d.",
HILOG_INFO("StartSpecifiedAbilityResponseStub::OnReceived, code = %{public}u, flags= %{public}d.",
code, option.GetFlags());
std::u16string descriptor = StartSpecifiedAbilityResponseStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();

2
interfaces/innerkits/form_manager/src/form_host_stub.cpp
View File

@ -47,7 +47,7 @@ FormHostStub::~FormHostStub()
*/
int FormHostStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("FormHostStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("FormHostStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = FormHostStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/form_manager/src/form_mgr_stub.cpp
View File

@ -98,7 +98,7 @@ FormMgrStub::~FormMgrStub()
*/
int FormMgrStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("FormMgrStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("FormMgrStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = FormMgrStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/form_manager/src/form_provider_stub.cpp
View File

@ -54,7 +54,7 @@ FormProviderStub::~FormProviderStub()
*/
int FormProviderStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("FormProviderStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("FormProviderStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = FormProviderStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

2
interfaces/innerkits/form_manager/src/form_supply_stub.cpp
View File

@ -44,7 +44,7 @@ FormSupplyStub::~FormSupplyStub()
*/
int FormSupplyStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
{
HILOG_INFO("FormSupplyStub::OnReceived, code = %{public}d, flags= %{public}d.", code, option.GetFlags());
HILOG_INFO("FormSupplyStub::OnReceived, code = %{public}u, flags= %{public}d.", code, option.GetFlags());
std::u16string descriptor = FormSupplyStub::GetDescriptor();
std::u16string remoteDescriptor = data.ReadInterfaceToken();
if (descriptor != remoteDescriptor) {

4
interfaces/kits/napi/aafwk/inner/napi_common/napi_common_util.cpp
View File

@ -230,7 +230,7 @@ std::string UnwrapStringFromJS(napi_env env, napi_value param, const std::string
if (buf == nullptr) {
return value;
}
memset_s(buf, size + 1, 0, size + 1);
(void)memset_s(buf, size + 1, 0, size + 1);
bool rev = napi_get_value_string_utf8(env, param, buf, size + 1, &size) == napi_ok;
if (rev) {
@ -260,7 +260,7 @@ bool UnwrapStringFromJS2(napi_env env, napi_value param, std::string &value)
if (buf == nullptr) {
return false;
}
memset_s(buf, (size + 1), 0, (size + 1));
(void)memset_s(buf, (size + 1), 0, (size + 1));
bool rev = napi_get_value_string_utf8(env, param, buf, size + 1, &size) == napi_ok;
if (rev) {

2
services/appmgr/src/system_environment_information.cpp
View File

@ -98,7 +98,7 @@ static void RequestSystemMemoryInfo(std::map<std::string, std::string> &memInfo)
while (fgets(buff, sizeof(buff), fp) != nullptr) {
std::string strbuf(buff);
memset_s(buff, sizeof(buff), 0x00, sizeof(buff));
(void)memset_s(buff, sizeof(buff), 0x00, sizeof(buff));
std::smatch sm;
std::smatch smData;
bool flag = false;

1
services/formmgr/test/mock/src/mock_form_provider_client.cpp
View File

@ -39,6 +39,7 @@ int MockFormProviderClient::AcquireProviderFormInfo(const int64_t formId, const
sptr<IFormSupply> formSupply = iface_cast<IFormSupply>(callerToken);
if (formSupply == nullptr) {
HILOG_ERROR("failed to get formSupplyProxy");
return ERR_OK;
}
FormProviderInfo formProviderInfo;

8
test/resource/amssystemtestability/abilitySrc/amsKitSystemTest/src/second_ability.cpp
View File

@ -4601,7 +4601,7 @@ void SecondAbility::WantSetParamShortCase3(int code)
{
std::string key = "key";
short value = 999;
int size = 5;
short size = 5;
Want want;
for (short i = 0; i < size; i++) {
want.SetParam(key, static_cast<short>(i * value));
@ -4615,7 +4615,7 @@ void SecondAbility::WantSetParamShortCase4(int code)
{
std::string key = "key";
short value = 999;
int size = 5;
short size = 5;
Want want;
for (short i = 0; i < size; i++) {
want.SetParam(key + std::to_string(i), static_cast<short>(i * value));
@ -4667,7 +4667,7 @@ void SecondAbility::WantSetParamShortArrayCase2(int code)
void SecondAbility::WantSetParamShortArrayCase3(int code)
{
std::string key = "key";
int size = 5;
short size = 5;
short sValue = 999;
std::vector<short> value(size, sValue * size);
Want want;
@ -4683,7 +4683,7 @@ void SecondAbility::WantSetParamShortArrayCase3(int code)
void SecondAbility::WantSetParamShortArrayCase4(int code)
{
std::string key = "key";
int size = 5;
short size = 5;
short value = 999;
Want want;
for (short i = 1; i <= size; i++) {

2
tools/aa/src/ability_command.cpp
View File

@ -637,7 +637,7 @@ ErrCode AbilityManagerShellCommand::RunAsDumpsysCommand()
break;
}
case 'l': {
if (isfirstCommand == false && optarg == nullptr) {
if (isfirstCommand == false) {
isfirstCommand = true;
} else {
// 'aa dumpsys -i 10 -element -lastpage'