From eacd1087750601309fd698727296f58e2a7519dc Mon Sep 17 00:00:00 2001 From: 15690690116 Date: Fri, 21 Mar 2025 17:12:07 +0800 Subject: [PATCH] del 401 Signed-off-by: 15690690116 --- frameworks/fontmgr/include/font_define.h | 1 - frameworks/fontmgr/src/font_manager.cpp | 2 +- frameworks/fontmgr/test/unittest/src/font_manager_test.cpp | 4 ++-- interfaces/js/kits/src/font_manager_addon.cpp | 4 ++-- service/src/font_manager_client.cpp | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/frameworks/fontmgr/include/font_define.h b/frameworks/fontmgr/include/font_define.h index 695606d..8a10c8d 100644 --- a/frameworks/fontmgr/include/font_define.h +++ b/frameworks/fontmgr/include/font_define.h @@ -23,7 +23,6 @@ enum FontErrorCode { SUCCESS = 0, ERR_NO_PERMISSION = 201, ERR_NOT_SYSTEM_APP = 202, - ERR_INVALID_PARAM = 401, ERR_FILE_NOT_EXISTS = 31100101, ERR_FILE_VERIFY_FAIL = 31100102, diff --git a/frameworks/fontmgr/src/font_manager.cpp b/frameworks/fontmgr/src/font_manager.cpp index 0b18198..1c090bc 100644 --- a/frameworks/fontmgr/src/font_manager.cpp +++ b/frameworks/fontmgr/src/font_manager.cpp @@ -164,7 +164,7 @@ int32_t FontManager::UninstallFont(const std::string &fontFullName) FONT_LOGI("FontManager UninstallFont: %{public}s", fontFullName.c_str()); if (fontFullName.empty()) { FONT_LOGE("FontManager::UninstallFont, fontName is empty"); - return ERR_INVALID_PARAM; + return ERR_UNINSTALL_FILE_NOT_EXISTS; } FontConfig fontConfig(FONT_CONFIG_FILE); std::string path = fontConfig.GetFontFileByName(fontFullName); diff --git a/frameworks/fontmgr/test/unittest/src/font_manager_test.cpp b/frameworks/fontmgr/test/unittest/src/font_manager_test.cpp index 3ecf6b1..14f5838 100644 --- a/frameworks/fontmgr/test/unittest/src/font_manager_test.cpp +++ b/frameworks/fontmgr/test/unittest/src/font_manager_test.cpp @@ -123,7 +123,7 @@ HWTEST_F(FontManagerTest, FontManagerFuncTest002, TestSize.Level1) ret = this->manager_.UninstallFont(fontfullname); EXPECT_EQ(ret, ERR_UNINSTALL_FILE_NOT_EXISTS); ret = this->manager_.UninstallFont(""); - EXPECT_EQ(ret, ERR_INVALID_PARAM); + EXPECT_EQ(ret, ERR_UNINSTALL_FILE_NOT_EXISTS); } /** @@ -285,7 +285,7 @@ HWTEST_F(FontManagerTest, FontManagerFuncTest009, TestSize.Level1) ret = this->manager_.UninstallFont(TTC_FONT_FULL_NAME[0]); EXPECT_EQ(ret, ERR_UNINSTALL_FILE_NOT_EXISTS); ret = this->manager_.UninstallFont(""); - EXPECT_EQ(ret, ERR_INVALID_PARAM); + EXPECT_EQ(ret, ERR_UNINSTALL_FILE_NOT_EXISTS); } /** diff --git a/interfaces/js/kits/src/font_manager_addon.cpp b/interfaces/js/kits/src/font_manager_addon.cpp index 88f922e..3a92d76 100644 --- a/interfaces/js/kits/src/font_manager_addon.cpp +++ b/interfaces/js/kits/src/font_manager_addon.cpp @@ -163,7 +163,7 @@ auto installFontFunc = [](napi_env env, void* data) { FontNapiCallback *callback = static_cast(data); if (callback->value_.empty()) { - callback->SetErrorMsg("invalid param", ERR_INVALID_PARAM); + callback->SetErrorMsg("invalid param", ERR_FILE_NOT_EXISTS); return; } int ret = FontManagerClient::InstallFont(callback->value_, callback->errCode_); @@ -185,7 +185,7 @@ auto uninstallFontFunc = [](napi_env env, void* data) { FontNapiCallback *callback = static_cast(data); if (callback->value_.empty()) { - callback->SetErrorMsg("invalid param", ERR_INVALID_PARAM); + callback->SetErrorMsg("invalid param", ERR_UNINSTALL_FILE_NOT_EXISTS); return; } int ret = FontManagerClient::UninstallFont(callback->value_, callback->errCode_); diff --git a/service/src/font_manager_client.cpp b/service/src/font_manager_client.cpp index 214aa1b..d2a327c 100644 --- a/service/src/font_manager_client.cpp +++ b/service/src/font_manager_client.cpp @@ -37,12 +37,12 @@ int32_t FontManagerClient::InstallFont(const std::string &fontPath, int &outValu std::string realPath; if (!PathToRealPath(fontPath, realPath)) { FONT_LOGE("failed to get real path %{private}s, errno %{public}d", fontPath.c_str(), errno); - return ERR_INVALID_PARAM; + return ERR_FILE_NOT_EXISTS; } int fd = open(realPath.c_str(), O_RDONLY); if (fd < 0) { FONT_LOGE("open font file failed, errno: %{public}d", errno); - return ERR_INVALID_PARAM; + return ERR_FILE_NOT_EXISTS; } int32_t ret = service->InstallFont(fd, outValue); -- Gitee