diff --git a/services/bundlemgr_lite/src/bundle_manager_service.cpp b/services/bundlemgr_lite/src/bundle_manager_service.cpp index fd5bf03..8fab372 100644 --- a/services/bundlemgr_lite/src/bundle_manager_service.cpp +++ b/services/bundlemgr_lite/src/bundle_manager_service.cpp @@ -672,10 +672,9 @@ static int32_t GenerateInnerUid(std::map &innerMap, const std: } int32_t ret = 0; for (int32_t i = 0; i < innerMap.rbegin()->first; ++i) { - if (innerMap.find(i) == innerMap.end()) { - innerMap.emplace(i, bundleName); - ret = i + baseUid; - return ret; + auto res = innerMap.emplace(i, bundleName); + if (res.second) { + return i + baseUid; } } diff --git a/services/bundlemgr_lite/src/bundle_ms_feature.cpp b/services/bundlemgr_lite/src/bundle_ms_feature.cpp index b8412f6..ab4cfd9 100644 --- a/services/bundlemgr_lite/src/bundle_ms_feature.cpp +++ b/services/bundlemgr_lite/src/bundle_ms_feature.cpp @@ -120,13 +120,6 @@ BOOL BundleMsFeature::OnFeatureMessage(Feature *feature, Request *request) return TRUE; } -static void InnerFreeDataBuff(void *ptr) -{ - if (ptr != nullptr) { - cJSON_free(ptr); - } -} - uint8_t BundleMsFeature::HasSystemCapability(const uint8_t funcId, IpcIo *req, IpcIo *reply) { if ((req == nullptr) || (reply == nullptr)) { diff --git a/services/bundlemgr_lite/src/zip_file.cpp b/services/bundlemgr_lite/src/zip_file.cpp index bb0614f..0970ae9 100755 --- a/services/bundlemgr_lite/src/zip_file.cpp +++ b/services/bundlemgr_lite/src/zip_file.cpp @@ -140,7 +140,8 @@ bool ZipFile::ParseAllEntries() break; } - size_t fileLength = (directoryEntry.nameSize >= MAX_FILE_NAME) ? (MAX_FILE_NAME - 1) : (directoryEntry.nameSize); + size_t fileLength = + (directoryEntry.nameSize >= MAX_FILE_NAME) ? (MAX_FILE_NAME - 1) : (directoryEntry.nameSize); if (fread(&(fileName[0]), fileLength, FILE_READ_COUNT, file_) != FILE_READ_COUNT) { HILOG_ERROR(HILOG_MODULE_APP, "parse entry(%{public}d) read file name failed, error: %{public}s", i, strerror(errno));