From 77bc84a6de802eac7b58979517857db28aba8ce7 Mon Sep 17 00:00:00 2001 From: huaqingsimeng <1004904143@qq.com> Date: Tue, 23 May 2023 19:17:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD=E6=81=A2=E5=A4=8D=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: huaqingsimeng --- utils/BUILD.gn | 4 --- utils/include/b_error/b_error.h | 63 ++++++++++++++++++--------------- utils/src/b_error/b_error.cpp | 6 +--- 3 files changed, 35 insertions(+), 38 deletions(-) diff --git a/utils/BUILD.gn b/utils/BUILD.gn index d31d500c6..5833e5aa0 100644 --- a/utils/BUILD.gn +++ b/utils/BUILD.gn @@ -25,10 +25,6 @@ config("utils_public_config") { include_dirs = [ "include", "${path_base}/include", - "${path_filemgmt_libn}/include", - "${path_napi}/interfaces/inner_api", - "${path_napi}/interfaces/kits", - "//third_party/node/src", ] } diff --git a/utils/include/b_error/b_error.h b/utils/include/b_error/b_error.h index dd58e794c..6c549639b 100644 --- a/utils/include/b_error/b_error.h +++ b/utils/include/b_error/b_error.h @@ -30,8 +30,6 @@ #include #include -#include "n_error.h" - #if __has_builtin(__builtin_FILE) && __has_builtin(__builtin_LINE) && __has_builtin(__builtin_FUNCTION) #define DEFINE_SOURCE_LOCATION \ int lineNo = __builtin_LINE(), const char *fileName = __builtin_FILE(), \ @@ -83,6 +81,16 @@ public: EXT_BROKEN_IPC = 0x5003, }; + enum BackupErrorCode { + E_IPCSS = 13600001, + E_PERM = 13900001, + E_IO = 13900005, + E_NOMEM = 13900011, + E_INVAL = 13900020, + E_NOSPC = 13900025, + E_UKERR = 13900042, + }; + public: /** * @brief 返回OHOS标准错误码 @@ -199,33 +207,30 @@ private: static inline const std::map errCodeTable_ { {static_cast(Codes::OK), static_cast(Codes::OK)}, - {static_cast(Codes::UTILS_INVAL_JSON_ENTITY), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_INVAL}, - {static_cast(Codes::UTILS_INVAL_FILE_HANDLE), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_INVAL}, - {static_cast(Codes::UTILS_INVAL_TARBALL_ARG), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR}, - {static_cast(Codes::UTILS_INVAL_PROCESS_ARG), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR}, - {static_cast(Codes::UTILS_INTERRUPTED_PROCESS), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR}, - {static_cast(Codes::TOOL_INVAL_ARG), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR}, - {static_cast(Codes::SA_INVAL_ARG), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_INVAL}, - {static_cast(Codes::SA_BROKEN_IPC), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfStorageService::E_IPCSS}, - {static_cast(Codes::SA_REFUSED_ACT), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_PERM}, - {static_cast(Codes::SA_BROKEN_ROOT_DIR), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR}, - {static_cast(Codes::SDK_INVAL_ARG), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_INVAL}, - {static_cast(Codes::SDK_BROKEN_IPC), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfStorageService::E_IPCSS}, - {static_cast(Codes::SDK_MIXED_SCENARIO), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_INVAL}, - {static_cast(Codes::EXT_INVAL_ARG), LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_INVAL}, - {static_cast(Codes::EXT_BROKEN_FRAMEWORK), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR}, - {static_cast(Codes::EXT_BROKEN_BACKUP_SA), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfStorageService::E_IPCSS}, - {static_cast(Codes::EXT_BROKEN_IPC), - LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfStorageService::E_IPCSS}, + {static_cast(Codes::UTILS_INVAL_JSON_ENTITY), BackupErrorCode::E_INVAL}, + {static_cast(Codes::UTILS_INVAL_FILE_HANDLE), BackupErrorCode::E_INVAL}, + {static_cast(Codes::UTILS_INVAL_TARBALL_ARG), BackupErrorCode::E_UKERR}, + {static_cast(Codes::UTILS_INVAL_PROCESS_ARG), BackupErrorCode::E_UKERR}, + {static_cast(Codes::UTILS_INTERRUPTED_PROCESS), BackupErrorCode::E_UKERR}, + {static_cast(Codes::TOOL_INVAL_ARG), BackupErrorCode::E_UKERR}, + {static_cast(Codes::SA_INVAL_ARG), BackupErrorCode::E_INVAL}, + {static_cast(Codes::SA_BROKEN_IPC), BackupErrorCode::E_IPCSS}, + {static_cast(Codes::SA_REFUSED_ACT), BackupErrorCode::E_PERM}, + {static_cast(Codes::SA_BROKEN_ROOT_DIR), BackupErrorCode::E_UKERR}, + {static_cast(Codes::SDK_INVAL_ARG), BackupErrorCode::E_INVAL}, + {static_cast(Codes::SDK_BROKEN_IPC), BackupErrorCode::E_IPCSS}, + {static_cast(Codes::SDK_MIXED_SCENARIO), BackupErrorCode::E_INVAL}, + {static_cast(Codes::EXT_INVAL_ARG), BackupErrorCode::E_INVAL}, + {static_cast(Codes::EXT_BROKEN_FRAMEWORK), BackupErrorCode::E_UKERR}, + {static_cast(Codes::EXT_BROKEN_BACKUP_SA), BackupErrorCode::E_IPCSS}, + {static_cast(Codes::EXT_BROKEN_IPC), BackupErrorCode::E_IPCSS}, + {BackupErrorCode::E_IPCSS, BackupErrorCode::E_IPCSS}, + {BackupErrorCode::E_INVAL, BackupErrorCode::E_INVAL}, + {BackupErrorCode::E_UKERR, BackupErrorCode::E_UKERR}, + {BackupErrorCode::E_PERM, BackupErrorCode::E_PERM}, + {BackupErrorCode::E_NOMEM, BackupErrorCode::E_NOMEM}, + {BackupErrorCode::E_NOSPC, BackupErrorCode::E_NOSPC}, + {BackupErrorCode::E_IO, BackupErrorCode::E_IO}, }; private: diff --git a/utils/src/b_error/b_error.cpp b/utils/src/b_error/b_error.cpp index 74987d5be..59443acf7 100644 --- a/utils/src/b_error/b_error.cpp +++ b/utils/src/b_error/b_error.cpp @@ -54,14 +54,10 @@ string BError::WrapMessageWithExtraInfos(const char *fileName, int BError::GetCode() const { int code = static_cast(GetRawCode()); - if (LibN::errCodeTable.find(code) != LibN::errCodeTable.end()) { - auto [err, msg] = LibN::errCodeTable.at(code); - return err; - } if (errCodeTable_.find(code) != errCodeTable_.end()) { return errCodeTable_.at(code); } HILOGE("Unknown code : %{public}d", code); - return LibN::FILEIO_SYS_CAP_TAG + LibN::ErrCodeSuffixOfFileIO::E_UKERR; + return BackupErrorCode::E_UKERR; } } // namespace OHOS::FileManagement::Backup \ No newline at end of file -- Gitee