From 595d7f9ec6b999e87bb07685701b5debf63b618f Mon Sep 17 00:00:00 2001 From: shilei91 Date: Tue, 8 Nov 2022 09:00:17 +0000 Subject: [PATCH] update services/bundlemgr_lite/src/bundle_util.cpp. Signed-off-by: shilei91 --- services/bundlemgr_lite/src/bundle_util.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/services/bundlemgr_lite/src/bundle_util.cpp b/services/bundlemgr_lite/src/bundle_util.cpp index 38df72b..ae73c7f 100644 --- a/services/bundlemgr_lite/src/bundle_util.cpp +++ b/services/bundlemgr_lite/src/bundle_util.cpp @@ -49,8 +49,8 @@ const int32_t MAX_JSON_SIZE = 1024 * 64; const uint32_t MAX_JSON_SIZE = 1024 * 64; #endif +#ifdef __LITEOS_M__ #ifndef CONFIG_FT_MODE - static void *CJsonBmsMalloc(size_t size) { return OhosMalloc(MEM_TYPE_CJSON_LSRAM, size); @@ -69,7 +69,7 @@ static void OhosBmsCjsonHooksInit(void) cJSON_InitHooks(&hooks); } #endif // CONFIG_FT_MODE - +#endif // __LITEOS_M__ /* * path should not include ".." or "./" or ".\0" */ @@ -114,8 +114,10 @@ bool BundleUtil::IsFile(const char *path) if (ret != 0) { return false; } +#ifdef __LITEOS_M__ #ifndef CONFIG_FT_MODE OhosBmsCjsonHooksInit(); +#endif #endif int32_t fp = open(path, O_RDONLY, S_IREAD | S_IWRITE); if (fp >= 0) { @@ -136,8 +138,10 @@ bool BundleUtil::IsDir(const char *path) if (ret != 0) { return false; } +#ifdef __LITEOS_M__ #ifndef CONFIG_FT_MODE OhosBmsCjsonHooksInit(); +#endif #endif if ((buf.st_mode & S_IFDIR) == S_IFDIR) { return true; @@ -208,8 +212,10 @@ uint32_t BundleUtil::GetFileSize(const char *filePath) if (ret != 0) { return 0; } +#ifdef __LITEOS_M__ #ifndef CONFIG_FT_MODE OhosBmsCjsonHooksInit(); +#endif #endif return fileInfo.st_size; } @@ -284,8 +290,10 @@ uint32_t BundleUtil::GetCurrentFolderSize(const char *dirPath, List* lis list->PushBack(Utils::Strdup(filePath)); } } +#ifdef __LITEOS_M__ #ifndef CONFIG_FT_MODE OhosBmsCjsonHooksInit(); +#endif #endif closedir(dir); return fileSize; @@ -382,8 +390,10 @@ cJSON *BundleUtil::GetJsonStream(const char *path) #endif return nullptr; } +#ifdef __LITEOS_M__ #ifndef CONFIG_FT_MODE OhosBmsCjsonHooksInit(); +#endif #endif if (size > MAX_JSON_SIZE) { #ifdef APP_PLATFORM_WATCHGT