From 05e6b3c9c90d7a94fdd4bf50d62cfcf83fc2fbb3 Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Wed, 25 Sep 2024 17:32:21 +0800 Subject: [PATCH] fix:diff Signed-off-by: zhouoaoteng --- .../inner_api/file_access/src/file_access_ext_ability.cpp | 2 ++ .../inner_api/file_access/src/file_access_ext_proxy.cpp | 1 + interfaces/inner_api/file_access/src/file_access_ext_stub.cpp | 2 ++ interfaces/inner_api/file_access/src/file_access_helper.cpp | 2 ++ interfaces/kits/native/recent/recent_n_exporter.cpp | 2 +- interfaces/kits/picker/picker.js | 1 - .../entry/src/main/ets/FileExtensionAbility/Common.ts | 4 ++-- .../src/main/ets/FileExtensionAbility/FileExtensionAbility.ts | 2 +- utils/file_util.h | 2 +- 9 files changed, 12 insertions(+), 6 deletions(-) diff --git a/interfaces/inner_api/file_access/src/file_access_ext_ability.cpp b/interfaces/inner_api/file_access/src/file_access_ext_ability.cpp index 3a16de4c..281f2a8c 100644 --- a/interfaces/inner_api/file_access/src/file_access_ext_ability.cpp +++ b/interfaces/inner_api/file_access/src/file_access_ext_ability.cpp @@ -37,10 +37,12 @@ void FileAccessExtAbility::SetCreator(const CreatorFunc &creator) FileAccessExtAbility* FileAccessExtAbility::Create(const std::unique_ptr &runtime) { if (runtime == nullptr) { + HILOG_ERROR("Create runtime is nullptr"); return new FileAccessExtAbility(); } if (creator_) { + HILOG_ERROR("Create creator_ is nullptr"); return creator_(runtime); } diff --git a/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp b/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp index 09273855..c7b511f9 100644 --- a/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp +++ b/interfaces/inner_api/file_access/src/file_access_ext_proxy.cpp @@ -585,6 +585,7 @@ int FileAccessExtProxy::ListFile(const FileInfo &fileInfo, const int64_t offset, int ret = WriteFileFilterFuncArguments(data, std::make_tuple(&fileInfo, offset, &filter, &memInfo)); if (ret != ERR_OK) { + HILOG_ERROR("WriteFileFilterFuncArguments failed err: %{public}d", ret); return ret; } diff --git a/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp b/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp index c341a4ad..0550f427 100644 --- a/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp +++ b/interfaces/inner_api/file_access/src/file_access_ext_stub.cpp @@ -438,10 +438,12 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply std::tie(ret, fileInfo, offset, filter, memInfo) = ReadFileFilterFuncArguments(data); if (ret != ERR_OK) { + HILOG_ERROR("ListFile ReadFileFilterFuncArguments error"); return ret; } ret = SharedMemoryOperation::MapSharedMemory(*memInfo); if (ret != ERR_OK) { + HILOG_ERROR("ListFile MapSharedMemory error"); return ret; } diff --git a/interfaces/inner_api/file_access/src/file_access_helper.cpp b/interfaces/inner_api/file_access/src/file_access_helper.cpp index 6bbd80be..cbd85f18 100644 --- a/interfaces/inner_api/file_access/src/file_access_helper.cpp +++ b/interfaces/inner_api/file_access/src/file_access_helper.cpp @@ -96,11 +96,13 @@ sptr FileAccessHelper::GetBundleMgrProxy() sptr systemAbilityManager = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (!systemAbilityManager) { + HILOG_ERROR("systemAbilityManager error"); return nullptr; } sptr remoteObject = systemAbilityManager->GetSystemAbility(BUNDLE_MGR_SERVICE_SYS_ABILITY_ID); if (!remoteObject) { + HILOG_ERROR("remoteObject error"); return nullptr; } diff --git a/interfaces/kits/native/recent/recent_n_exporter.cpp b/interfaces/kits/native/recent/recent_n_exporter.cpp index 1695d158..85af5524 100644 --- a/interfaces/kits/native/recent/recent_n_exporter.cpp +++ b/interfaces/kits/native/recent/recent_n_exporter.cpp @@ -164,7 +164,7 @@ static void Deleter(struct NameListArg *arg) (arg->namelist)[i] = nullptr; } free(arg->namelist); - free(arg); + delete arg; arg = nullptr; } diff --git a/interfaces/kits/picker/picker.js b/interfaces/kits/picker/picker.js index b12bd07e..7b3ded41 100644 --- a/interfaces/kits/picker/picker.js +++ b/interfaces/kits/picker/picker.js @@ -548,7 +548,6 @@ function getSelectedSuffixIndex() { console.log('[picker] Get Selected Suffix Index end: ' + index); return index; } - async function sendResult(args, result) { try { if (result === undefined) { diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts index d8e2c59d..c09b24f6 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/Common.ts @@ -26,7 +26,7 @@ function checkUri(uri: string): boolean { hilog.info(DOMAIN_CODE, TAG, 'uri is ' + uri); return true; } else { - hilog.error(DOMAIN_CODE, TAG, 'checkUri error, uri is ' + uri); + hilog.error(DOMAIN_CODE, TAG, 'checkUri failed, uri is ' + uri); return false; } } catch (error) { @@ -47,7 +47,7 @@ function getPath(uri): string { if (arr[1].indexOf('/') > 0 && arr[1].split('/')[0] === BUNDLE_NAME) { path = path.replace(arr[1].split('/')[0], ''); } else { - hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is ' + uri); + hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri = ' + uri); return ''; } diff --git a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts index 0a528306..7f2c77b6 100644 --- a/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts +++ b/services/file_extension_hap/entry/src/main/ets/FileExtensionAbility/FileExtensionAbility.ts @@ -811,7 +811,7 @@ export default class FileExtAbility extends Extension { try { roots = roots.concat(getHmdfsPath()); } catch (e) { - hilog.info(DOMAIN_CODE, TAG, 'getRoots errorcode: ' + e.code, ' message: ' + e.message); + hilog.info(DOMAIN_CODE, TAG, 'getRoots failed errorcode is: ' + e.code, ' message: ' + e.message); } return rootsReturnObject(roots, ERR_OK); diff --git a/utils/file_util.h b/utils/file_util.h index 32487323..e937c8e4 100644 --- a/utils/file_util.h +++ b/utils/file_util.h @@ -57,7 +57,7 @@ static void Deleter(struct NameListArg *arg) (arg->namelist)[i] = nullptr; } free(arg->namelist); - free(arg); + delete arg; arg = nullptr; } -- Gitee