From 192790070a6ad0e0b03203eec76318113abb4d13 Mon Sep 17 00:00:00 2001 From: zhouoaoteng Date: Thu, 24 Oct 2024 09:27:05 +0800 Subject: [PATCH] fix:code diff Signed-off-by: zhouoaoteng --- .../js/napi/file_access_module/napi_fileaccess_helper.cpp | 1 + .../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 | 2 +- .../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/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp b/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp index 06d5b947..0ba439e7 100644 --- a/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp +++ b/frameworks/js/napi/file_access_module/napi_fileaccess_helper.cpp @@ -224,6 +224,7 @@ napi_value NAPI_GetFileAccessAbilityInfo(napi_env env, napi_callback_info info) return NError(ret); }; auto cbComplete = [result](napi_env env, NError err) -> NVal { + HILOG_INFO("cbComplete in"); if (err) { return { env, err.GetNapiErr(env) }; } 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..3c0b1c48 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("fail to WriteFileFilterFuncArguments. 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..8bb93007 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(" failed to ReadFileFilterFuncArguments"); return ret; } ret = SharedMemoryOperation::MapSharedMemory(*memInfo); if (ret != ERR_OK) { + HILOG_ERROR("failed to MapSharedMemory"); 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..4837e2fa 100644 --- a/interfaces/inner_api/file_access/src/file_access_helper.cpp +++ b/interfaces/inner_api/file_access/src/file_access_helper.cpp @@ -932,6 +932,7 @@ int FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo(std::vectorQueryExtensionAbilityInfos( AppExecFwk::ExtensionAbilityType::FILEACCESS_EXTENSION, GetUserId(), extensionInfos); + HILOG_INFO("QueryExtensionAbilityInfos end."); if (!ret) { HILOG_ERROR("FileAccessHelper::GetRegisteredFileAccessExtAbilityInfo QueryExtensionAbilityInfos error"); return E_GETINFO; 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 6ca1b034..395c6fc3 100644 --- a/interfaces/kits/picker/picker.js +++ b/interfaces/kits/picker/picker.js @@ -553,7 +553,7 @@ function getSelectedSuffixIndex() { async function sendResult(args, result) { try { if (result === undefined) { - console.log('[picker] modal picker: result is undefined.'); + console.log('[picker] result is undefined.'); return undefined; } if (args.length === ARGS_TWO && typeof args[ARGS_ONE] === 'function') { 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..51cd8b8f 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) { @@ -40,7 +40,7 @@ function getPath(uri): string { let arr = uri.split(sep); let minLength = 2; if (arr.length < minLength) { - hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is' + uri); + hilog.error(DOMAIN_CODE, TAG, 'getPath-parameter-uri format exception, uri is:' + uri); return ''; } let path = uri.replace(arr[0] + sep, ''); 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..d052f116 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: ' + 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