From 8f3ea3927f37c878669652d6d95b57053fc13e45 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Mon, 18 Jul 2022 17:47:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- frameworks/innerkits/file_access/BUILD.gn | 2 +- .../include/file_access_ext_ability.h | 8 +-- .../file_access_ext_ability_module_loader.h | 6 +- .../include/file_access_ext_connection.h | 6 +- .../include/file_access_ext_proxy.h | 10 +-- .../include/file_access_ext_stub.h | 6 +- .../include/file_access_ext_stub_impl.h | 8 +-- .../include/file_access_extension_info.h | 4 +- .../file_access/include/file_access_helper.h | 7 +- .../include/ifile_access_ext_base.h | 8 +-- .../include/js_file_access_ext_ability.h | 12 ++-- .../include/napi_common_fileaccess.h | 6 +- .../src/file_access_ext_ability.cpp | 10 +-- .../src/file_access_ext_connection.cpp | 2 +- .../file_access/src/file_access_ext_proxy.cpp | 24 +++---- .../file_access/src/file_access_ext_stub.cpp | 70 +++++++++---------- .../src/file_access_ext_stub_impl.cpp | 56 +++++++-------- .../file_access/src/file_access_helper.cpp | 2 +- .../src/js_file_access_ext_ability.cpp | 49 +++++++------ .../napi/common/file_extension_info_napi.cpp | 10 +-- .../napi/common/file_extension_info_napi.h | 6 +- .../napi_fileaccess_helper.h | 6 +- .../native_fileaccess_module.cpp | 4 -- .../napi/file_extension_info_module/BUILD.gn | 2 +- .../module_export_napi.h | 8 +-- utils/file_access_framework_errno.h | 8 ++- utils/hilog_wrapper.h | 6 +- 27 files changed, 170 insertions(+), 176 deletions(-) diff --git a/frameworks/innerkits/file_access/BUILD.gn b/frameworks/innerkits/file_access/BUILD.gn index 1fd54251..fec4310f 100644 --- a/frameworks/innerkits/file_access/BUILD.gn +++ b/frameworks/innerkits/file_access/BUILD.gn @@ -47,7 +47,7 @@ config("ability_public_config") { } ohos_shared_library("file_access_extension_ability_kit") { - include_dirs = [ "//foundation/ability/ability_runtime/interfaces/kits/native/appkit/ability_runtime/context" ] + include_dirs = [ "${ability_runtime_path}/interfaces/kits/native/appkit/ability_runtime/context" ] sources = [ "src/file_access_ext_ability.cpp", diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index 7689afb0..1341e864 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXT_ABILITY_H -#define FILE_EXT_ABILITY_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_H #include "extension_base.h" #include "file_access_extension_info.h" @@ -39,7 +39,7 @@ public: static FileAccessExtAbility* Create(const std::unique_ptr& runtime); - virtual int OpenFile(const Uri &uri, int flags); + virtual int OpenFile(const Uri &uri, const int flags); virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Delete(const Uri &sourceFile); @@ -54,4 +54,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_EXT_ABILITY_H \ No newline at end of file +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h b/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h index 174bad17..eb66f99b 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXT_ABILITY_MODULE_LOADER_H -#define FILE_EXT_ABILITY_MODULE_LOADER_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H #include #include @@ -37,4 +37,4 @@ public: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_EXT_ABILITY_MODULE_LOADER_H \ No newline at end of file +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_ext_connection.h b/frameworks/innerkits/file_access/include/file_access_ext_connection.h index 4d51afb8..dbf3d92e 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_connection.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_connection.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXT_CONNECTION_H -#define FILE_EXT_CONNECTION_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_CONNECTION_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_CONNECTION_H #include #include @@ -57,4 +57,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_EXT_CONNECTION_H +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_CONNECTION_H diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index f450951c..fba8047f 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXT_PROXY_H -#define FILE_EXT_PROXY_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_PROXY_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_PROXY_H #include #include @@ -32,11 +32,11 @@ namespace OHOS { namespace FileAccessFwk { class FileAccessExtProxy : public IRemoteProxy { public: - explicit FileAccessExtProxy(const sptr& remote) : IRemoteProxy(remote) {} + explicit FileAccessExtProxy(const sptr &remote) : IRemoteProxy(remote) {} virtual ~FileAccessExtProxy() {} - virtual int OpenFile(const Uri &uri, int flags) override; + virtual int OpenFile(const Uri &uri, const int flags) override; virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; virtual int Delete(const Uri &sourceFile) override; @@ -50,4 +50,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_EXT_PROXY_H +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_PROXY_H diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub.h b/frameworks/innerkits/file_access/include/file_access_ext_stub.h index 8c232892..86575873 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXT_STUB_H -#define FILE_EXT_STUB_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_H #include @@ -49,4 +49,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_EXT_STUB_H \ No newline at end of file +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index 4ee634a0..0ae0c617 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXT_STUB_IMPL_H -#define FILE_EXT_STUB_IMPL_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_IMPL_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_IMPL_H #include #include @@ -34,7 +34,7 @@ public: virtual ~FileAccessExtStubImpl() {} - int OpenFile(const Uri &uri, int flags) override; + int OpenFile(const Uri &uri, const int flags) override; int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; @@ -49,4 +49,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_EXT_STUB_IMPL_H \ No newline at end of file +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_IMPL_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index 232d5b4b..bca79230 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_ACCESS_EXTENSION_INFO_H -#define FILE_ACCESS_EXTENSION_INFO_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXTENSION_INFO_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXTENSION_INFO_H #include #include diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index df3899d0..5a83ac49 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_ACCESS_HELPER_H -#define FILE_ACCESS_HELPER_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_HELPER_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_HELPER_H #include #include @@ -65,7 +65,6 @@ private: sptr token_ = {}; AAFwk::Want want_ = {}; sptr fileAccessExtProxy_ = nullptr; - bool isSystemCaller_ = false; sptr callerDeathRecipient_ = nullptr; sptr fileAccessExtConnection_ = nullptr; }; @@ -82,4 +81,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_ACCESS_HELPER_H +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_HELPER_H diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index fdc837b8..2f3eb833 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef I_FILE_EXT_BASE_H -#define I_FILE_EXT_BASE_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_I_FILE_ACCESS_EXT_BASE_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_I_FILE_ACCESS_EXT_BASE_H #include #include @@ -41,7 +41,7 @@ public: CMD_GET_ROOTS }; - virtual int OpenFile(const Uri &uri, int flags) = 0; + virtual int OpenFile(const Uri &uri, const int flags) = 0; virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) = 0; virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) = 0; virtual int Delete(const Uri &sourceFile) = 0; @@ -53,4 +53,4 @@ public: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // I_FILE_EXT_BASE_H +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_I_FILE_ACCESS_EXT_BASE_H diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index 49d26194..c7ed25e3 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef JS_FILE_EXT_ABILITY_H -#define JS_FILE_EXT_ABILITY_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_JS_FILE_ACCESS_EXT_ABILITY_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_JS_FILE_ACCESS_EXT_ABILITY_H #include "file_access_ext_ability.h" #include "file_access_extension_info.h" @@ -45,10 +45,10 @@ struct CallbackParam { class JsFileAccessExtAbility : public FileAccessExtAbility { public: - JsFileAccessExtAbility(JsRuntime& jsRuntime); + JsFileAccessExtAbility(JsRuntime &jsRuntime); virtual ~JsFileAccessExtAbility() override; - static JsFileAccessExtAbility* Create(const std::unique_ptr& runtime); + static JsFileAccessExtAbility* Create(const std::unique_ptr &runtime); void Init(const std::shared_ptr &record, const std::shared_ptr &application, @@ -56,7 +56,7 @@ public: const sptr &token) override; void OnStart(const AAFwk::Want &want) override; sptr OnConnect(const AAFwk::Want &want) override; - int OpenFile(const Uri &uri, int flags) override; + int OpenFile(const Uri &uri, const int flags) override; int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; @@ -74,4 +74,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // JS_FILE_EXT_ABILITY_H \ No newline at end of file +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_JS_FILE_ACCESS_EXT_ABILITY_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/napi_common_fileaccess.h b/frameworks/innerkits/file_access/include/napi_common_fileaccess.h index 1051b06d..99313df7 100644 --- a/frameworks/innerkits/file_access/include/napi_common_fileaccess.h +++ b/frameworks/innerkits/file_access/include/napi_common_fileaccess.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef NAPI_COMMON_FILE_ACCESS_H -#define NAPI_COMMON_FILE_ACCESS_H +#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_NAPI_COMMON_FILE_ACCESS_H +#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_NAPI_COMMON_FILE_ACCESS_H #include #include @@ -51,4 +51,4 @@ napi_value WrapArrayDeviceInfoToJS(napi_env env, const std::vector & bool UnwrapArrayDeviceInfoFromJS(napi_env env, napi_value param, std::vector &deviceInfoVec); } // namespace FileAccessFwk } // namespace OHOS -#endif // NAPI_COMMON_FILE_ACCESS_H +#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_NAPI_COMMON_FILE_ACCESS_H diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index a570e63d..e09c62f1 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -28,19 +28,21 @@ namespace FileAccessFwk { using namespace OHOS::AppExecFwk; CreatorFunc FileAccessExtAbility::creator_ = nullptr; -void FileAccessExtAbility::SetCreator(const CreatorFunc& creator) +void FileAccessExtAbility::SetCreator(const CreatorFunc &creator) { creator_ = creator; } -FileAccessExtAbility* FileAccessExtAbility::Create(const std::unique_ptr& runtime) +FileAccessExtAbility* FileAccessExtAbility::Create(const std::unique_ptr &runtime) { - if (!runtime) { + if (runtime == nullptr) { return new FileAccessExtAbility(); } + if (creator_) { return creator_(runtime); } + switch (runtime->GetLanguage()) { case Runtime::Language::JS: return JsFileAccessExtAbility::Create(runtime); @@ -58,7 +60,7 @@ void FileAccessExtAbility::Init(const std::shared_ptr &recor ExtensionBase<>::Init(record, application, handler, token); } -int FileAccessExtAbility::OpenFile(const Uri &uri, int flags) +int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) { return ERR_OK; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp index 5d5da63c..1cce254f 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_connection.cpp @@ -85,7 +85,7 @@ void FileAccessExtConnection::DisconnectFileExtAbility() fileExtProxy_ = nullptr; isConnected_.store(false); ErrCode ret = AAFwk::AbilityManagerClient::GetInstance()->DisconnectAbility(this); - HILOG_INFO("%{public}s called end, ret=%{public}d", __func__, ret); + HILOG_INFO("DisconnectFileExtAbility called end, ret=%{public}d", ret); } bool FileAccessExtConnection::IsExtAbilityConnected() diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index 059331c8..b192be0b 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace FileAccessFwk { -int FileAccessExtProxy::OpenFile(const Uri &uri, int flags) +int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); MessageParcel data; @@ -52,14 +52,14 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, int flags) if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int fd = reply.ReadFileDescriptor(); if (fd <= ERR_ERROR) { HILOG_ERROR("fail to ReadFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return fd; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -100,14 +100,14 @@ int FileAccessExtProxy::CreateFile(const Uri &parent, const std::string &display if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); @@ -156,14 +156,14 @@ int FileAccessExtProxy::Mkdir(const Uri &parent, const std::string &displayName, if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); @@ -201,14 +201,14 @@ int FileAccessExtProxy::Delete(const Uri &sourceFile) if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ret; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); @@ -249,7 +249,7 @@ int FileAccessExtProxy::Move(const Uri &sourceFile, const Uri &targetParent, Uri if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = reply.ReadInt32(); @@ -305,14 +305,14 @@ int FileAccessExtProxy::Rename(const Uri &sourceFile, const std::string &display if (err != NO_ERROR) { HILOG_ERROR("fail to SendRequest. err: %{public}d", err); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return err; } int ret = reply.ReadInt32(); if (ret < ERR_OK) { HILOG_ERROR("fail to ReadInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_IPC_ERROR; + return ret; } std::unique_ptr tempUri(reply.ReadParcelable()); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index b0887857..01b431b6 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -87,14 +87,14 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdOpenFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("uri is nullptr"); + HILOG_ERROR("OpenFile uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int flags = data.ReadInt32(); if (flags < 0) { - HILOG_ERROR("flags is invalid"); + HILOG_ERROR("OpenFile flags is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } @@ -107,7 +107,7 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply } if (!reply.WriteFileDescriptor(fd)) { - HILOG_ERROR("fail to WriteFileDescriptor fd"); + HILOG_ERROR("OpenFile fail to WriteFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -121,21 +121,21 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdCreateFile"); std::shared_ptr parent(data.ReadParcelable()); if (parent == nullptr) { - HILOG_ERROR("parent is nullptr"); + HILOG_ERROR("CreateFile parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::string displayName = data.ReadString(); if (displayName.empty()) { - HILOG_ERROR("displayName is nullptr"); + HILOG_ERROR("CreateFile displayName is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("fileNew is nullptr"); + HILOG_ERROR("CreateFile fileNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -144,17 +144,17 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep if (ret < 0) { HILOG_ERROR("CreateFile fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("fail to WriteInt32 ret"); + HILOG_ERROR("CreateFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("fail to WriteParcelable type"); + HILOG_ERROR("CreateFile fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -168,21 +168,21 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdMkdir"); std::shared_ptr parent(data.ReadParcelable()); if (parent == nullptr) { - HILOG_ERROR("parent is nullptr"); + HILOG_ERROR("Mkdir parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::string displayName = data.ReadString(); if (displayName.empty()) { - HILOG_ERROR("mode is nullptr"); + HILOG_ERROR("Mkdir mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("fileNew is nullptr"); + HILOG_ERROR("Mkdir fileNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -191,17 +191,17 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) if (ret < 0) { HILOG_ERROR("Mkdir fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("fail to WriteInt32 ret"); + HILOG_ERROR("Mkdir fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("fail to WriteParcelable type"); + HILOG_ERROR("Mkdir fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -215,7 +215,7 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdDelete"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("uri is nullptr"); + HILOG_ERROR("Delete uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -224,11 +224,11 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) if (ret < 0) { HILOG_ERROR("Delete fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("fail to WriteFileDescriptor ret"); + HILOG_ERROR("Delete fail to WriteFileDescriptor ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -242,21 +242,21 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdMove"); std::shared_ptr sourceFile(data.ReadParcelable()); if (sourceFile == nullptr) { - HILOG_ERROR("sourceFile is nullptr"); + HILOG_ERROR("Move sourceFile is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::shared_ptr targetParent(data.ReadParcelable()); if (targetParent == nullptr) { - HILOG_ERROR("targetParent is nullptr"); + HILOG_ERROR("Move targetParent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR(" fileNew is nullptr"); + HILOG_ERROR("Move fileNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -265,17 +265,17 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) if (ret < 0) { HILOG_ERROR("Move fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("fail to WriteInt32 ret"); + HILOG_ERROR("Move fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("fail to WriteParcelable type"); + HILOG_ERROR("Move fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -289,21 +289,21 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdRename"); std::shared_ptr sourceFile(data.ReadParcelable()); if (sourceFile == nullptr) { - HILOG_ERROR("sourceFileUri is nullptr"); + HILOG_ERROR("Rename sourceFileUri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::string displayName = data.ReadString(); if (displayName.empty()) { - HILOG_ERROR("mode is nullptr"); + HILOG_ERROR("Rename mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("fileUriNew is nullptr"); + HILOG_ERROR("Rename fileUriNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -312,17 +312,17 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) if (ret < 0) { HILOG_ERROR("Rename fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return ERR_FILEIO_FAIL; + return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("fail to WriteInt32 ret"); + HILOG_ERROR("Rename fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("fail to WriteParcelable type"); + HILOG_ERROR("Rename fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -336,7 +336,7 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdListFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("uri is nullptr"); + HILOG_ERROR("ListFile uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -344,14 +344,14 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply std::vector vec = ListFile(*uri); uint64_t count {vec.size()}; if (!reply.WriteUint64(count)) { - HILOG_ERROR("fail to WriteInt32 count"); + HILOG_ERROR("ListFile fail to WriteInt32 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("fail to WriteParcelable vec"); + HILOG_ERROR("ListFile fail to WriteParcelable vec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -367,14 +367,14 @@ ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply std::vector vec = GetRoots(); uint64_t count {vec.size()}; if (!reply.WriteUint64(count)) { - HILOG_ERROR("fail to WriteInt32 count"); + HILOG_ERROR("GetRoots fail to WriteInt32 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("fail to WriteParcelable ret"); + HILOG_ERROR("GetRoots fail to WriteParcelable ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 26fd26e2..d130e163 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -30,14 +30,13 @@ int FileAccessExtStubImpl::OpenFile(const Uri &uri, int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); int ret = ERR_ERROR; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("OpenFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } - ret = extension->OpenFile(uri, flags); + ret = extension_->OpenFile(uri, flags); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -46,14 +45,13 @@ int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &disp { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); int ret = ERR_ERROR; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("CreateFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } - ret = extension->CreateFile(parent, displayName, newFile); + ret = extension_->CreateFile(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -62,14 +60,13 @@ int FileAccessExtStubImpl::Mkdir(const Uri &parent, const std::string &displayNa { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Mkdir"); int ret = ERR_ERROR; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("Mkdir get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } - ret = extension->Mkdir(parent, displayName, newFile); + ret = extension_->Mkdir(parent, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -78,14 +75,13 @@ int FileAccessExtStubImpl::Delete(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Delete"); int ret = ERR_ERROR; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("Delete get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } - ret = extension->Delete(sourceFile); + ret = extension_->Delete(sourceFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -94,14 +90,13 @@ int FileAccessExtStubImpl::Move(const Uri &sourceFile, const Uri &targetParent, { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Move"); int ret = ERR_ERROR; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("Move get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } - ret = extension->Move(sourceFile, targetParent, newFile); + ret = extension_->Move(sourceFile, targetParent, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -110,14 +105,13 @@ int FileAccessExtStubImpl::Rename(const Uri &sourceFile, const std::string &disp { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "Rename"); int ret = ERR_ERROR; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("Rename get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } - ret = extension->Rename(sourceFile, displayName, newFile); + ret = extension_->Rename(sourceFile, displayName, newFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } @@ -126,14 +120,13 @@ std::vector FileAccessExtStubImpl::ListFile(const Uri &sourceFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "ListFile"); std::vector vec; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("ListFile get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; } - vec = extension->ListFile(sourceFile); + vec = extension_->ListFile(sourceFile); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; } @@ -142,14 +135,13 @@ std::vector FileAccessExtStubImpl::GetRoots() { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "GetRoots"); std::vector vec; - auto extension = GetOwner(); - if (extension == nullptr) { - HILOG_ERROR("get extension failed."); + if (extension_ == nullptr) { + HILOG_ERROR("GetRoots get extension failed."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; } - vec = extension->GetRoots(); + vec = extension_->GetRoots(); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; } diff --git a/frameworks/innerkits/file_access/src/file_access_helper.cpp b/frameworks/innerkits/file_access/src/file_access_helper.cpp index 9a3a497a..958a1fd1 100644 --- a/frameworks/innerkits/file_access/src/file_access_helper.cpp +++ b/frameworks/innerkits/file_access/src/file_access_helper.cpp @@ -141,7 +141,7 @@ bool FileAccessHelper::GetProxy() } fileAccessExtProxy_ = fileAccessExtConnection_->GetFileExtProxy(); - if (isSystemCaller_ && fileAccessExtProxy_) { + if (fileAccessExtProxy_) { AddFileAccessDeathRecipient(fileAccessExtProxy_->AsObject()); } diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index 30764f8d..a8afa3ab 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -35,21 +35,21 @@ namespace OHOS { namespace FileAccessFwk { namespace { -constexpr size_t ARGC_ZERO = 0; -constexpr size_t ARGC_ONE = 1; -constexpr size_t ARGC_TWO = 2; + constexpr size_t ARGC_ZERO = 0; + constexpr size_t ARGC_ONE = 1; + constexpr size_t ARGC_TWO = 2; } using namespace OHOS::AppExecFwk; using namespace OHOS::AbilityRuntime; using OHOS::Security::AccessToken::AccessTokenKit; -JsFileAccessExtAbility* JsFileAccessExtAbility::Create(const std::unique_ptr& runtime) +JsFileAccessExtAbility* JsFileAccessExtAbility::Create(const std::unique_ptr &runtime) { return new JsFileAccessExtAbility(static_cast(*runtime)); } -JsFileAccessExtAbility::JsFileAccessExtAbility(JsRuntime& jsRuntime) : jsRuntime_(jsRuntime) {} +JsFileAccessExtAbility::JsFileAccessExtAbility(JsRuntime &jsRuntime) : jsRuntime_(jsRuntime) {} JsFileAccessExtAbility::~JsFileAccessExtAbility() = default; void JsFileAccessExtAbility::Init(const std::shared_ptr &record, @@ -158,7 +158,7 @@ static bool DoAsnycWork(CallbackParam *param) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "DoAsnycWork"); if (param == nullptr || param->jsObj == nullptr) { - HILOG_ERROR("Not found js file object"); + HILOG_ERROR("pararm is nullptr or param->jsObj is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return false; } @@ -307,15 +307,15 @@ int JsFileAccessExtAbility::CreateFile(const Uri &parent, const std::string &dis FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } + std::string uriStr = OHOS::AppExecFwk::UnwrapStringFromJS(env, reinterpret_cast(nativeResult)); if (uriStr.empty()) { HILOG_ERROR("call createFile with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; - } else { - ret = NO_ERROR; } + ret = NO_ERROR; newFile = Uri(uriStr); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; @@ -342,15 +342,15 @@ int JsFileAccessExtAbility::Mkdir(const Uri &parent, const std::string &displayN FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } + std::string uriStr = OHOS::AppExecFwk::UnwrapStringFromJS(env, reinterpret_cast(nativeResult)); if (uriStr.empty()) { HILOG_ERROR("call Mkdir with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; - } else { - ret = NO_ERROR; } + ret = NO_ERROR; newFile = Uri(uriStr); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; @@ -401,15 +401,15 @@ int JsFileAccessExtAbility::Move(const Uri &sourceFile, const Uri &targetParent, FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } + std::string uriStr = OHOS::AppExecFwk::UnwrapStringFromJS(env, reinterpret_cast(nativeResult)); if (uriStr.empty()) { HILOG_ERROR("call move with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; - } else { - ret = NO_ERROR; } + ret = NO_ERROR; newFile = Uri(uriStr); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; @@ -436,15 +436,15 @@ int JsFileAccessExtAbility::Rename(const Uri &sourceFile, const std::string &dis FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } + std::string uriStr = OHOS::AppExecFwk::UnwrapStringFromJS(env, reinterpret_cast(nativeResult)); if (uriStr.empty()) { HILOG_ERROR("call rename with return empty."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; - } else { - ret = NO_ERROR; } - + + ret = NO_ERROR; newFile = Uri(uriStr); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; @@ -468,14 +468,15 @@ std::vector JsFileAccessExtAbility::ListFile(const Uri &sourceFile) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; } + if (UnwrapArrayFileInfoFromJS(env, reinterpret_cast(nativeResult), vec)) { FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; - } else { - HILOG_ERROR("end with faild."); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; } + + HILOG_ERROR("listfile end with faild."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return vec; } std::vector JsFileAccessExtAbility::GetRoots() @@ -487,19 +488,21 @@ std::vector JsFileAccessExtAbility::GetRoots() std::vector vec; NativeValue* argv[] = {}; NativeValue* nativeResult = AsnycCallObjectMethod("getRoots", argv, ARGC_ZERO); + if (nativeResult == nullptr) { HILOG_ERROR("call getRoots with return null."); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; } + if (UnwrapArrayDeviceInfoFromJS(env, reinterpret_cast(nativeResult), vec)) { FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return vec; - } else { - HILOG_ERROR("end with faild."); - FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return vec; } + + HILOG_ERROR("getroots end with faild."); + FinishTrace(HITRACE_TAG_FILEMANAGEMENT); + return vec; } } // namespace FileAccessFwk } // namespace OHOS \ No newline at end of file diff --git a/interfaces/kits/napi/common/file_extension_info_napi.cpp b/interfaces/kits/napi/common/file_extension_info_napi.cpp index 5673104c..2f4e5453 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.cpp +++ b/interfaces/kits/napi/common/file_extension_info_napi.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -30,7 +30,7 @@ napi_value CreateStringUtf8(napi_env env, const std::string &str) { napi_value value = nullptr; if (napi_create_string_utf8(env, str.c_str(), str.length(), &value) != napi_ok) { - HILOG_ERROR("%{public}s, value is not napi_ok", __func__); + HILOG_ERROR("CreateStringUtf8, value is not napi_ok"); return nullptr; } return value; @@ -40,7 +40,7 @@ napi_value CreateUint32(napi_env env, uint32_t val) { napi_value value = nullptr; if (napi_create_uint32(env, val, &value) != napi_ok) { - HILOG_ERROR("%{public}s, value is not napi_ok", __func__); + HILOG_ERROR("CreateUint32, value is not napi_ok"); return nullptr; } return value; @@ -55,7 +55,7 @@ napi_value FileInfoConstructor(napi_env env, napi_callback_info info) napi_status status = napi_get_cb_info(env, info, &argc, args, &res, &data); if (status != napi_ok) { - HILOG_ERROR("%{public}s, status is not napi_ok", __func__); + HILOG_ERROR("FileInfoConstructor, status is not napi_ok"); return nullptr; } @@ -71,7 +71,7 @@ napi_value DeviceInfoConstructor(napi_env env, napi_callback_info info) napi_status status = napi_get_cb_info(env, info, &argc, args, &res, &data); if (status != napi_ok) { - HILOG_ERROR("%{public}s, status is not napi_ok", __func__); + HILOG_ERROR("DeviceInfoConstructor, status is not napi_ok"); return nullptr; } diff --git a/interfaces/kits/napi/common/file_extension_info_napi.h b/interfaces/kits/napi/common/file_extension_info_napi.h index e66a8b02..f6174412 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.h +++ b/interfaces/kits/napi/common/file_extension_info_napi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FILE_EXTENSION_INFO_NAPI_H -#define FILE_EXTENSION_INFO_NAPI_H +#ifndef INTERFACES_KITS_NAPI_COMMON_FILE_EXTENSION_INFO_NAPI_H +#define INTERFACES_KITS_NAPI_COMMON_FILE_EXTENSION_INFO_NAPI_H #include "napi/native_node_api.h" diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h index 5f3836ce..04d93722 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef NAPI_FILEACCESS_HELPER_H -#define NAPI_FILEACCESS_HELPER_H +#ifndef INTERFACES_KITS_NAPI_FILE_ACCESS_EXT_ABILITY_NAPI_FILEACCESS_HELPER_H +#define INTERFACES_KITS_NAPI_FILE_ACCESS_EXT_ABILITY_NAPI_FILEACCESS_HELPER_H #include "napi/native_api.h" #include "napi/native_common.h" @@ -34,4 +34,4 @@ namespace FileAccessFwk { napi_value NAPI_GetRoots(napi_env env, napi_callback_info info); } } // namespace FileAccessFwk -#endif // FILE_ACCESS_NAPI_H \ No newline at end of file +#endif // INTERFACES_KITS_NAPI_FILE_ACCESS_EXT_ABILITY_NAPI_FILEACCESS_HELPER_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp index 5154db21..266a3939 100644 --- a/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp +++ b/interfaces/kits/napi/file_access_module/native_fileaccess_module.cpp @@ -13,15 +13,11 @@ * limitations under the License. */ -#include -#include - #include "file_extension_info_napi.h" #include "hilog_wrapper.h" #include "napi_fileaccess_helper.h" #include "napi/native_api.h" #include "napi/native_node_api.h" -using namespace std; namespace OHOS { namespace FileAccessFwk { diff --git a/interfaces/kits/napi/file_extension_info_module/BUILD.gn b/interfaces/kits/napi/file_extension_info_module/BUILD.gn index 51a3de14..31a1235c 100644 --- a/interfaces/kits/napi/file_extension_info_module/BUILD.gn +++ b/interfaces/kits/napi/file_extension_info_module/BUILD.gn @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Huawei Device Co., Ltd. +# Copyright (c) 2022 Huawei Device Co., Ltd. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/interfaces/kits/napi/file_extension_info_module/module_export_napi.h b/interfaces/kits/napi/file_extension_info_module/module_export_napi.h index c49f3b0a..5394fd15 100644 --- a/interfaces/kits/napi/file_extension_info_module/module_export_napi.h +++ b/interfaces/kits/napi/file_extension_info_module/module_export_napi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2022 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -13,10 +13,10 @@ * limitations under the License. */ -#ifndef MODULE_EXPORT_NAPI_H -#define MODULE_EXPORT_NAPI_H +#ifndef INTERFACES_KITS_NAPI_FILE_EXTENSION_INFO_MODULE_MODULE_EXPORT_NAPI_H +#define INTERFACES_KITS_NAPI_FILE_EXTENSION_INFO_MODULE_MODULE_EXPORT_NAPI_H namespace OHOS { namespace FileAccessFwk { } // namespace FileAccessFwk } // namespace OHOS -#endif // MODULE_EXPORT_NAPI_H \ No newline at end of file +#endif // INTERFACES_KITS_NAPI_FILE_EXTENSION_INFO_MODULE_MODULE_EXPORT_NAPI_H \ No newline at end of file diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 6f8bfd17..919604f1 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -12,8 +12,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef FILE_ACCESS_FRAMEWORK_ERRNO_H -#define FILE_ACCESS_FRAMEWORK_ERRNO_H + +#ifndef UTILS_FILE_ACCESS_FRAMEWORK_ERRNO_H +#define UTILS_FILE_ACCESS_FRAMEWORK_ERRNO_H + #include "errors.h" namespace OHOS { @@ -35,4 +37,4 @@ enum { }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FILE_ACCESS_FRAMEWORK_ERRNO_H \ No newline at end of file +#endif // UTILS_FILE_ACCESS_FRAMEWORK_ERRNO_H \ No newline at end of file diff --git a/utils/hilog_wrapper.h b/utils/hilog_wrapper.h index 6df10f62..fc3e6d4a 100644 --- a/utils/hilog_wrapper.h +++ b/utils/hilog_wrapper.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef HILOG_WRAPPER_H -#define HILOG_WRAPPER_H +#ifndef UTILS_HILOG_WRAPPER_H +#define UTILS_HILOG_WRAPPER_H #define CONFIG_HILOG #ifdef CONFIG_HILOG @@ -78,4 +78,4 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = {LOG_CORE, FAF_LOG_DOMA #define HILOG_DEBUG(...) #endif // CONFIG_HILOG -#endif // HILOG_WRAPPER_H \ No newline at end of file +#endif // UTILS_HILOG_WRAPPER_H \ No newline at end of file -- Gitee From 9a7f85e59a9d4823f0b1caf5fd4ed1f3816d5f54 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 19 Jul 2022 10:17:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=81=97=E6=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../innerkits/file_access/src/file_access_ext_stub_impl.cpp | 2 +- .../innerkits/file_access/src/js_file_access_ext_ability.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index d130e163..77fe27ce 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -26,7 +26,7 @@ std::shared_ptr FileAccessExtStubImpl::GetOwner() return extension_; } -int FileAccessExtStubImpl::OpenFile(const Uri &uri, int flags) +int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); int ret = ERR_ERROR; diff --git a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp index a8afa3ab..4dc21c9b 100644 --- a/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/js_file_access_ext_ability.cpp @@ -259,7 +259,7 @@ void JsFileAccessExtAbility::GetSrcPath(std::string &srcPath) FinishTrace(HITRACE_TAG_FILEMANAGEMENT); } -int JsFileAccessExtAbility::OpenFile(const Uri &uri, int flags) +int JsFileAccessExtAbility::OpenFile(const Uri &uri, const int flags) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "OpenFile"); HandleScope handleScope(jsRuntime_); -- Gitee From 0ebe89ec2e9b551b0cef7103dc82809b51ee052f Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Tue, 19 Jul 2022 18:05:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../include/file_access_ext_ability.h | 2 +- .../include/file_access_ext_stub_impl.h | 2 +- .../src/file_access_ext_ability.cpp | 2 +- .../file_access/src/file_access_ext_proxy.cpp | 2 +- .../file_access/src/file_access_ext_stub.cpp | 70 +++++++++---------- .../src/file_access_ext_stub_impl.cpp | 2 +- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index 1341e864..f992b99d 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -40,7 +40,7 @@ public: static FileAccessExtAbility* Create(const std::unique_ptr& runtime); virtual int OpenFile(const Uri &uri, const int flags); - virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile); + virtual int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile); virtual int Delete(const Uri &sourceFile); virtual int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile); diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index 0ae0c617..d561a267 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -35,7 +35,7 @@ public: virtual ~FileAccessExtStubImpl() {} int OpenFile(const Uri &uri, const int flags) override; - int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; + int CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Mkdir(const Uri &parent, const std::string &displayName, Uri &newFile) override; int Delete(const Uri &sourceFile) override; int Move(const Uri &sourceFile, const Uri &targetParent, Uri &newFile) override; diff --git a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp index e09c62f1..3aee053a 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_ability.cpp @@ -65,7 +65,7 @@ int FileAccessExtAbility::OpenFile(const Uri &uri, const int flags) return ERR_OK; } -int FileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) +int FileAccessExtAbility::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { return ERR_OK; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp index b192be0b..c230661f 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_proxy.cpp @@ -59,7 +59,7 @@ int FileAccessExtProxy::OpenFile(const Uri &uri, const int flags) if (fd <= ERR_ERROR) { HILOG_ERROR("fail to ReadFileDescriptor fd"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); - return fd; + return ERR_INVALID_FD; } FinishTrace(HITRACE_TAG_FILEMANAGEMENT); diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp index 01b431b6..dcf26327 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub.cpp @@ -87,21 +87,21 @@ ErrCode FileAccessExtStub::CmdOpenFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdOpenFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("OpenFile uri is nullptr"); + HILOG_ERROR("parameter-uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int flags = data.ReadInt32(); if (flags < 0) { - HILOG_ERROR("OpenFile flags is invalid"); + HILOG_ERROR("parameter OpenFile flags is invalid"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_ERROR; } int fd = OpenFile(*uri, flags); if (fd < 0) { - HILOG_ERROR("OpenFile fail, fd is %{pubilc}d", fd); + HILOG_ERROR("parameter OpenFile fail, fd is %{pubilc}d", fd); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_FD; } @@ -121,40 +121,40 @@ ErrCode FileAccessExtStub::CmdCreateFile(MessageParcel &data, MessageParcel &rep StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdCreateFile"); std::shared_ptr parent(data.ReadParcelable()); if (parent == nullptr) { - HILOG_ERROR("CreateFile parent is nullptr"); + HILOG_ERROR("parameter-parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::string displayName = data.ReadString(); if (displayName.empty()) { - HILOG_ERROR("CreateFile displayName is nullptr"); + HILOG_ERROR("parameter CreateFile displayName is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("CreateFile fileNew is nullptr"); + HILOG_ERROR("parameter-fileNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int ret = CreateFile(*parent, displayName, *fileNew); if (ret < 0) { - HILOG_ERROR("CreateFile fail, ret is %{pubilc}d", ret); + HILOG_ERROR("parameter CreateFile fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("CreateFile fail to WriteInt32 ret"); + HILOG_ERROR("parameter CreateFile fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("CreateFile fail to WriteParcelable type"); + HILOG_ERROR("parameter CreateFile fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -168,40 +168,40 @@ ErrCode FileAccessExtStub::CmdMkdir(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdMkdir"); std::shared_ptr parent(data.ReadParcelable()); if (parent == nullptr) { - HILOG_ERROR("Mkdir parent is nullptr"); + HILOG_ERROR("parameter Mkdir parent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::string displayName = data.ReadString(); if (displayName.empty()) { - HILOG_ERROR("Mkdir mode is nullptr"); + HILOG_ERROR("parameter Mkdir mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("Mkdir fileNew is nullptr"); + HILOG_ERROR("parameter Mkdir fileNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int ret = Mkdir(*parent, displayName, *fileNew); if (ret < 0) { - HILOG_ERROR("Mkdir fail, ret is %{pubilc}d", ret); + HILOG_ERROR("parameter Mkdir fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("Mkdir fail to WriteInt32 ret"); + HILOG_ERROR("parameter Mkdir fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("Mkdir fail to WriteParcelable type"); + HILOG_ERROR("parameter Mkdir fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -215,20 +215,20 @@ ErrCode FileAccessExtStub::CmdDelete(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdDelete"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("Delete uri is nullptr"); + HILOG_ERROR("parameter Delete uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int ret = Delete(*uri); if (ret < 0) { - HILOG_ERROR("Delete fail, ret is %{pubilc}d", ret); + HILOG_ERROR("parameter Delete fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("Delete fail to WriteFileDescriptor ret"); + HILOG_ERROR("parameter Delete fail to WriteFileDescriptor ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -242,40 +242,40 @@ ErrCode FileAccessExtStub::CmdMove(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdMove"); std::shared_ptr sourceFile(data.ReadParcelable()); if (sourceFile == nullptr) { - HILOG_ERROR("Move sourceFile is nullptr"); + HILOG_ERROR("parameter Move sourceFile is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::shared_ptr targetParent(data.ReadParcelable()); if (targetParent == nullptr) { - HILOG_ERROR("Move targetParent is nullptr"); + HILOG_ERROR("parameter Move targetParent is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("Move fileNew is nullptr"); + HILOG_ERROR("parameter Move fileNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int ret = Move(*sourceFile, *targetParent, *fileNew); if (ret < 0) { - HILOG_ERROR("Move fail, ret is %{pubilc}d", ret); + HILOG_ERROR("parameter Move fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("Move fail to WriteInt32 ret"); + HILOG_ERROR("parameter Move fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("Move fail to WriteParcelable type"); + HILOG_ERROR("parameter Move fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -289,40 +289,40 @@ ErrCode FileAccessExtStub::CmdRename(MessageParcel &data, MessageParcel &reply) StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdRename"); std::shared_ptr sourceFile(data.ReadParcelable()); if (sourceFile == nullptr) { - HILOG_ERROR("Rename sourceFileUri is nullptr"); + HILOG_ERROR("parameter Rename sourceFileUri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } std::string displayName = data.ReadString(); if (displayName.empty()) { - HILOG_ERROR("Rename mode is nullptr"); + HILOG_ERROR("parameter Rename mode is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_PARAM; } std::shared_ptr fileNew(data.ReadParcelable()); if (fileNew == nullptr) { - HILOG_ERROR("Rename fileUriNew is nullptr"); + HILOG_ERROR("parameter Rename fileUriNew is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } int ret = Rename(*sourceFile, displayName, *fileNew); if (ret < 0) { - HILOG_ERROR("Rename fail, ret is %{pubilc}d", ret); + HILOG_ERROR("parameter Rename fail, ret is %{pubilc}d", ret); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ret; } if (!reply.WriteInt32(ret)) { - HILOG_ERROR("Rename fail to WriteInt32 ret"); + HILOG_ERROR("parameter Rename fail to WriteInt32 ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } if (!reply.WriteParcelable(&(*fileNew))) { - HILOG_ERROR("Rename fail to WriteParcelable type"); + HILOG_ERROR("parameter Rename fail to WriteParcelable type"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -336,7 +336,7 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CmdListFile"); std::shared_ptr uri(data.ReadParcelable()); if (uri == nullptr) { - HILOG_ERROR("ListFile uri is nullptr"); + HILOG_ERROR("parameter ListFile uri is nullptr"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_INVALID_URI; } @@ -344,14 +344,14 @@ ErrCode FileAccessExtStub::CmdListFile(MessageParcel &data, MessageParcel &reply std::vector vec = ListFile(*uri); uint64_t count {vec.size()}; if (!reply.WriteUint64(count)) { - HILOG_ERROR("ListFile fail to WriteInt32 count"); + HILOG_ERROR("parameter ListFile fail to WriteInt32 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("ListFile fail to WriteParcelable vec"); + HILOG_ERROR("parameter ListFile fail to WriteParcelable vec"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } @@ -367,14 +367,14 @@ ErrCode FileAccessExtStub::CmdGetRoots(MessageParcel &data, MessageParcel &reply std::vector vec = GetRoots(); uint64_t count {vec.size()}; if (!reply.WriteUint64(count)) { - HILOG_ERROR("GetRoots fail to WriteInt32 count"); + HILOG_ERROR("parameter GetRoots fail to WriteInt32 count"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } for (uint64_t i = 0; i < count; i++) { if (!reply.WriteParcelable(&vec[i])) { - HILOG_ERROR("GetRoots fail to WriteParcelable ret"); + HILOG_ERROR("parameter GetRoots fail to WriteParcelable ret"); FinishTrace(HITRACE_TAG_FILEMANAGEMENT); return ERR_IPC_ERROR; } diff --git a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp index 77fe27ce..cf383453 100644 --- a/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp +++ b/frameworks/innerkits/file_access/src/file_access_ext_stub_impl.cpp @@ -41,7 +41,7 @@ int FileAccessExtStubImpl::OpenFile(const Uri &uri, const int flags) return ret; } -int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) +int FileAccessExtStubImpl::CreateFile(const Uri &parent, const std::string &displayName, Uri &newFile) { StartTrace(HITRACE_TAG_FILEMANAGEMENT, "CreateFile"); int ret = ERR_ERROR; -- Gitee From 4e38f44e297f725b7bc290e7a72ce8f99c01e291 Mon Sep 17 00:00:00 2001 From: wangjianqiang Date: Wed, 20 Jul 2022 11:39:42 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E8=A7=86?= =?UTF-8?q?=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangjianqiang --- .../innerkits/file_access/include/file_access_ext_ability.h | 6 +++--- .../include/file_access_ext_ability_module_loader.h | 6 +++--- .../file_access/include/file_access_ext_connection.h | 6 +++--- .../innerkits/file_access/include/file_access_ext_proxy.h | 6 +++--- .../innerkits/file_access/include/file_access_ext_stub.h | 6 +++--- .../file_access/include/file_access_ext_stub_impl.h | 6 +++--- .../file_access/include/file_access_extension_info.h | 4 ++-- .../innerkits/file_access/include/file_access_helper.h | 6 +++--- .../innerkits/file_access/include/ifile_access_ext_base.h | 6 +++--- .../file_access/include/js_file_access_ext_ability.h | 6 +++--- .../innerkits/file_access/include/napi_common_fileaccess.h | 6 +++--- interfaces/kits/napi/common/file_extension_info_napi.h | 4 ++-- .../kits/napi/file_access_module/napi_fileaccess_helper.h | 6 +++--- .../napi/file_extension_info_module/module_export_napi.h | 6 +++--- utils/file_access_framework_errno.h | 6 +++--- utils/hilog_wrapper.h | 6 +++--- 16 files changed, 46 insertions(+), 46 deletions(-) diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability.h b/frameworks/innerkits/file_access/include/file_access_ext_ability.h index f992b99d..62bb646c 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_H +#ifndef FILE_ACCESS_EXT_ABILITY_H +#define FILE_ACCESS_EXT_ABILITY_H #include "extension_base.h" #include "file_access_extension_info.h" @@ -54,4 +54,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_H \ No newline at end of file +#endif // FILE_ACCESS_EXT_ABILITY_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h b/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h index eb66f99b..aa579d45 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_ability_module_loader.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H +#ifndef FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H +#define FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H #include #include @@ -37,4 +37,4 @@ public: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H \ No newline at end of file +#endif // FILE_ACCESS_EXT_ABILITY_MODULE_LOADER_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_ext_connection.h b/frameworks/innerkits/file_access/include/file_access_ext_connection.h index dbf3d92e..0040369f 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_connection.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_connection.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_CONNECTION_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_CONNECTION_H +#ifndef FILE_ACCESS_EXT_CONNECTION_H +#define FILE_ACCESS_EXT_CONNECTION_H #include #include @@ -57,4 +57,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_CONNECTION_H +#endif // FILE_ACCESS_EXT_CONNECTION_H diff --git a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h index fba8047f..0b1a7b0a 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_proxy.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_proxy.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_PROXY_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_PROXY_H +#ifndef FILE_ACCESS_EXT_PROXY_H +#define FILE_ACCESS_EXT_PROXY_H #include #include @@ -50,4 +50,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_PROXY_H +#endif // FILE_ACCESS_EXT_PROXY_H diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub.h b/frameworks/innerkits/file_access/include/file_access_ext_stub.h index 86575873..5766594d 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_H +#ifndef FILE_ACCESS_EXT_STUB_H +#define FILE_ACCESS_EXT_STUB_H #include @@ -49,4 +49,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_H \ No newline at end of file +#endif // FILE_ACCESS_EXT_STUB_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h index d561a267..63ee7b49 100644 --- a/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h +++ b/frameworks/innerkits/file_access/include/file_access_ext_stub_impl.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_IMPL_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_IMPL_H +#ifndef FILE_ACCESS_EXT_STUB_IMPL_H +#define FILE_ACCESS_EXT_STUB_IMPL_H #include #include @@ -49,4 +49,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXT_STUB_IMPL_H \ No newline at end of file +#endif // FILE_ACCESS_EXT_STUB_IMPL_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/file_access_extension_info.h b/frameworks/innerkits/file_access/include/file_access_extension_info.h index bca79230..232d5b4b 100644 --- a/frameworks/innerkits/file_access/include/file_access_extension_info.h +++ b/frameworks/innerkits/file_access/include/file_access_extension_info.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXTENSION_INFO_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_EXTENSION_INFO_H +#ifndef FILE_ACCESS_EXTENSION_INFO_H +#define FILE_ACCESS_EXTENSION_INFO_H #include #include diff --git a/frameworks/innerkits/file_access/include/file_access_helper.h b/frameworks/innerkits/file_access/include/file_access_helper.h index 5a83ac49..3acf6103 100644 --- a/frameworks/innerkits/file_access/include/file_access_helper.h +++ b/frameworks/innerkits/file_access/include/file_access_helper.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_HELPER_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_HELPER_H +#ifndef FILE_ACCESS_HELPER_H +#define FILE_ACCESS_HELPER_H #include #include @@ -81,4 +81,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_FILE_ACCESS_HELPER_H +#endif // FILE_ACCESS_HELPER_H diff --git a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h index 2f3eb833..554d5bb9 100644 --- a/frameworks/innerkits/file_access/include/ifile_access_ext_base.h +++ b/frameworks/innerkits/file_access/include/ifile_access_ext_base.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_I_FILE_ACCESS_EXT_BASE_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_I_FILE_ACCESS_EXT_BASE_H +#ifndef I_FILE_ACCESS_EXT_BASE_H +#define I_FILE_ACCESS_EXT_BASE_H #include #include @@ -53,4 +53,4 @@ public: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_I_FILE_ACCESS_EXT_BASE_H +#endif // I_FILE_ACCESS_EXT_BASE_H diff --git a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h index c7ed25e3..1ba07295 100644 --- a/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h +++ b/frameworks/innerkits/file_access/include/js_file_access_ext_ability.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_JS_FILE_ACCESS_EXT_ABILITY_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_JS_FILE_ACCESS_EXT_ABILITY_H +#ifndef JS_FILE_ACCESS_EXT_ABILITY_H +#define JS_FILE_ACCESS_EXT_ABILITY_H #include "file_access_ext_ability.h" #include "file_access_extension_info.h" @@ -74,4 +74,4 @@ private: }; } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_JS_FILE_ACCESS_EXT_ABILITY_H \ No newline at end of file +#endif // JS_FILE_ACCESS_EXT_ABILITY_H \ No newline at end of file diff --git a/frameworks/innerkits/file_access/include/napi_common_fileaccess.h b/frameworks/innerkits/file_access/include/napi_common_fileaccess.h index 99313df7..1051b06d 100644 --- a/frameworks/innerkits/file_access/include/napi_common_fileaccess.h +++ b/frameworks/innerkits/file_access/include/napi_common_fileaccess.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_NAPI_COMMON_FILE_ACCESS_H -#define FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_NAPI_COMMON_FILE_ACCESS_H +#ifndef NAPI_COMMON_FILE_ACCESS_H +#define NAPI_COMMON_FILE_ACCESS_H #include #include @@ -51,4 +51,4 @@ napi_value WrapArrayDeviceInfoToJS(napi_env env, const std::vector & bool UnwrapArrayDeviceInfoFromJS(napi_env env, napi_value param, std::vector &deviceInfoVec); } // namespace FileAccessFwk } // namespace OHOS -#endif // FRAMEWORK_INNERKITS_FILEACCESS_INCLUDE_NAPI_COMMON_FILE_ACCESS_H +#endif // NAPI_COMMON_FILE_ACCESS_H diff --git a/interfaces/kits/napi/common/file_extension_info_napi.h b/interfaces/kits/napi/common/file_extension_info_napi.h index f6174412..08c825a6 100644 --- a/interfaces/kits/napi/common/file_extension_info_napi.h +++ b/interfaces/kits/napi/common/file_extension_info_napi.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef INTERFACES_KITS_NAPI_COMMON_FILE_EXTENSION_INFO_NAPI_H -#define INTERFACES_KITS_NAPI_COMMON_FILE_EXTENSION_INFO_NAPI_H +#ifndef FILE_EXTENSION_INFO_NAPI_H +#define FILE_EXTENSION_INFO_NAPI_H #include "napi/native_node_api.h" diff --git a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h index 04d93722..3436517d 100644 --- a/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h +++ b/interfaces/kits/napi/file_access_module/napi_fileaccess_helper.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef INTERFACES_KITS_NAPI_FILE_ACCESS_EXT_ABILITY_NAPI_FILEACCESS_HELPER_H -#define INTERFACES_KITS_NAPI_FILE_ACCESS_EXT_ABILITY_NAPI_FILEACCESS_HELPER_H +#ifndef NAPI_FILEACCESS_HELPER_H +#define NAPI_FILEACCESS_HELPER_H #include "napi/native_api.h" #include "napi/native_common.h" @@ -34,4 +34,4 @@ namespace FileAccessFwk { napi_value NAPI_GetRoots(napi_env env, napi_callback_info info); } } // namespace FileAccessFwk -#endif // INTERFACES_KITS_NAPI_FILE_ACCESS_EXT_ABILITY_NAPI_FILEACCESS_HELPER_H \ No newline at end of file +#endif // NAPI_FILEACCESS_HELPER_H \ No newline at end of file diff --git a/interfaces/kits/napi/file_extension_info_module/module_export_napi.h b/interfaces/kits/napi/file_extension_info_module/module_export_napi.h index 5394fd15..2c5dab8f 100644 --- a/interfaces/kits/napi/file_extension_info_module/module_export_napi.h +++ b/interfaces/kits/napi/file_extension_info_module/module_export_napi.h @@ -13,10 +13,10 @@ * limitations under the License. */ -#ifndef INTERFACES_KITS_NAPI_FILE_EXTENSION_INFO_MODULE_MODULE_EXPORT_NAPI_H -#define INTERFACES_KITS_NAPI_FILE_EXTENSION_INFO_MODULE_MODULE_EXPORT_NAPI_H +#ifndef MODULE_EXPORT_NAPI_H +#define MODULE_EXPORT_NAPI_H namespace OHOS { namespace FileAccessFwk { } // namespace FileAccessFwk } // namespace OHOS -#endif // INTERFACES_KITS_NAPI_FILE_EXTENSION_INFO_MODULE_MODULE_EXPORT_NAPI_H \ No newline at end of file +#endif // MODULE_EXPORT_NAPI_H \ No newline at end of file diff --git a/utils/file_access_framework_errno.h b/utils/file_access_framework_errno.h index 919604f1..e1b17824 100644 --- a/utils/file_access_framework_errno.h +++ b/utils/file_access_framework_errno.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef UTILS_FILE_ACCESS_FRAMEWORK_ERRNO_H -#define UTILS_FILE_ACCESS_FRAMEWORK_ERRNO_H +#ifndef FILE_ACCESS_FRAMEWORK_ERRNO_H +#define FILE_ACCESS_FRAMEWORK_ERRNO_H #include "errors.h" @@ -37,4 +37,4 @@ enum { }; } // namespace FileAccessFwk } // namespace OHOS -#endif // UTILS_FILE_ACCESS_FRAMEWORK_ERRNO_H \ No newline at end of file +#endif // FILE_ACCESS_FRAMEWORK_ERRNO_H \ No newline at end of file diff --git a/utils/hilog_wrapper.h b/utils/hilog_wrapper.h index fc3e6d4a..6df10f62 100644 --- a/utils/hilog_wrapper.h +++ b/utils/hilog_wrapper.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef UTILS_HILOG_WRAPPER_H -#define UTILS_HILOG_WRAPPER_H +#ifndef HILOG_WRAPPER_H +#define HILOG_WRAPPER_H #define CONFIG_HILOG #ifdef CONFIG_HILOG @@ -78,4 +78,4 @@ static constexpr OHOS::HiviewDFX::HiLogLabel LOG_LABEL = {LOG_CORE, FAF_LOG_DOMA #define HILOG_DEBUG(...) #endif // CONFIG_HILOG -#endif // UTILS_HILOG_WRAPPER_H \ No newline at end of file +#endif // HILOG_WRAPPER_H \ No newline at end of file -- Gitee