diff --git a/utils/BUILD.gn b/utils/BUILD.gn index d31d500c6412c030dc66b39f9e51ea69005035d7..5833e5aa0fba6a37664bf7a0ddcc2dcfe33cd706 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 dd58e794c40631e7067778eaa3fcc29589b81eb2..6c549639bdcc0498be0eba15d6ff9b14b10d5f92 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 74987d5be14aedad4cba39db0cdaeb3b3224d83a..59443acf76d05639c2cdc92efb8ba2b773b2a11a 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