openharmony/bundlemanager_bundle_framework_lite
1
0
Fork 0
mirror of https://github.com/openharmony/bundlemanager_bundle_framework_lite.git synced 2026-07-18 17:54:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix alerts

Browse Source 
Signed-off-by: xsz233 <xushizhe@huawei.com>
This commit is contained in:
xsz233
2022-10-27 10:50:25 +08:00
parent ce6166eb46
commit dc891cf355
2 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/bundlemgr_lite/src/bundle_manager_service.cpp
+2 -4
View File
@@ -648,8 +648,7 @@ uint32_t ManagerService::GetBundleSize(const char *bundleName)
std::string ManagerService::GetCodeDirPath() const
{
if (installer_ == nullptr) {
std::string codeDirPath;
return codeDirPath;
return "";
}
return installer_->GetCodeDirPath();
}
@@ -657,8 +656,7 @@ std::string ManagerService::GetCodeDirPath() const
std::string ManagerService::GetDataDirPath() const
{
if (installer_ == nullptr) {
std::string dataDirPath;
return dataDirPath;
return "";
}
return installer_->GetDataDirPath();
}
services/bundlemgr_lite/src/gt_bundle_manager_service.cpp
+15 -15
View File
@@ -320,17 +320,17 @@ void GtManagerService::InstallAllSystemBundle(InstallerCallback installerCallbac
if (currentNode == nullptr) {
return;
}
if ((strcmp((reinterpret_cast<AppInfoList *>(currentNode))->filePath, ".") == 0) ||
(strcmp((reinterpret_cast<AppInfoList *>(currentNode))->filePath, "..") == 0)) {
if ((strcmp(((AppInfoList *)currentNode)->filePath, ".") == 0) ||
(strcmp(((AppInfoList *)currentNode)->filePath, "..") == 0)) {
continue;
}
if (!BundleUtil::IsFile((reinterpret_cast<AppInfoList *>(currentNode))->filePath) ||
!BundleUtil::EndWith((reinterpret_cast<AppInfoList *>(currentNode))->filePath, INSTALL_FILE_SUFFIX)) {
if (!BundleUtil::IsFile(((AppInfoList *)currentNode)->filePath) ||
!BundleUtil::EndWith(((AppInfoList *)currentNode)->filePath, INSTALL_FILE_SUFFIX)) {
GtManagerService::APP_FreeAllAppInfo(list);
return;
}
(void) Install((reinterpret_cast<AppInfoList *>(currentNode))->filePath, nullptr, installerCallback);
(void) Install(((AppInfoList *)currentNode)->filePath, nullptr, installerCallback);
}
GtManagerService::APP_FreeAllAppInfo(list);
}
@@ -441,21 +441,21 @@ void GtManagerService::ScanSystemApp(const cJSON *uninstallRecord, List<ToBeInst
if (currentNode == nullptr) {
return;
}
if ((strcmp((reinterpret_cast<AppInfoList *>(currentNode))->filePath, ".") == 0) ||
(strcmp((reinterpret_cast<AppInfoList *>(currentNode))->filePath, "..") == 0)) {
if ((strcmp(((AppInfoList *)currentNode)->filePath, ".") == 0) ||
(strcmp(((AppInfoList *)currentNode)->filePath, "..") == 0)) {
continue;
}
if (BundleUtil::StartWith((reinterpret_cast<AppInfoList *>(currentNode))->filePath, SYSTEM_BUNDLE_PATH)) {
if (BundleUtil::StartWith(((AppInfoList *)currentNode)->filePath, SYSTEM_BUNDLE_PATH)) {
scanFlag = SYSTEM_APP_FLAG;
} else if (BundleUtil::StartWith((reinterpret_cast<AppInfoList *>(currentNode))->filePath, THIRD_SYSTEM_BUNDLE_PATH)) {
} else if (BundleUtil::StartWith(((AppInfoList *)currentNode)->filePath, THIRD_SYSTEM_BUNDLE_PATH)) {
scanFlag = THIRD_SYSTEM_APP_FLAG;
} else {
continue; // skip third app
}
// scan system app
bool res = CheckSystemBundleIsValid((reinterpret_cast<AppInfoList *>(currentNode))->filePath, &bundleName, versionCode);
bool res = CheckSystemBundleIsValid(((AppInfoList *)currentNode)->filePath, &bundleName, versionCode);
if (!res) {
APP_ERRCODE_EXTRA(EXCE_ACE_APP_SCAN, EXCE_ACE_APP_SCAN_INVALID_SYSTEM_APP);
AdapterFree(bundleName);
@@ -469,7 +469,7 @@ void GtManagerService::ScanSystemApp(const cJSON *uninstallRecord, List<ToBeInst
continue;
}
ReloadEntireBundleInfo((reinterpret_cast<AppInfoList *>(currentNode))->filePath, bundleName,
ReloadEntireBundleInfo(((AppInfoList *)currentNode)->filePath, bundleName,
systemPathList, versionCode, scanFlag);
AdapterFree(bundleName);
}
@@ -979,7 +979,7 @@ int32_t GtManagerService::ReportUninstallCallback(uint8_t errCode, uint8_t insta
AppInfoList *GtManagerService::APP_InitAllAppInfo()
{
AppInfoList *list = reinterpret_cast<AppInfoList *>(AdapterMalloc(sizeof(AppInfoList)));
AppInfoList *list = (AppInfoList *)AdapterMalloc(sizeof(AppInfoList));
if (list == nullptr) {
return nullptr;
}
@@ -1054,7 +1054,7 @@ void GtManagerService::APP_InsertAppInfo(char *filePath, AppInfoList *list)
return;
}
AppInfoList *app = reinterpret_cast<AppInfoList *>(AdapterMalloc(sizeof(AppInfoList)));
AppInfoList *app = (AppInfoList *)AdapterMalloc(sizeof(AppInfoList));
if (app == nullptr) {
return;
}
@@ -1110,7 +1110,7 @@ void SetCurrentBundle(const char *name)
}
int len = strlen(name);
g_currentBundle = static_cast<char *>(AdapterMalloc(len + 1));
g_currentBundle = (char *)AdapterMalloc(len + 1);
if (g_currentBundle == nullptr || strncpy_s(g_currentBundle, len + 1, name, len) < 0) {
AdapterFree(g_currentBundle);
}
@@ -1126,7 +1126,7 @@ const char *GetCurrentBundle()
}
int len = strlen(g_currentBundle);
char *bundleName = static_cast<char *>(AdapterMalloc(len + 1));
char *bundleName = (char *)AdapterMalloc(len + 1);
if (bundleName == nullptr || strncpy_s(bundleName, len + 1, g_currentBundle, len) < 0) {
AdapterFree(bundleName);
MutexRelease(&g_currentBundleMutex);