Moved CMountDirectoryArchive.h to include, changed type to sharedptr

Devsh-Graphics-Programming · May 26, 2023 · 7bd08b7 · 7bd08b7
1 parent e55b5a0
commit 7bd08b7
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 12 deletions.
diff --git a/include/nbl/system/CFileArchive.h b/include/nbl/system/CFileArchive.h
@@ -105,14 +105,13 @@ class CFileArchive : public IFileArchive
 		}
 
 	protected:
-		CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, core::vector<SFileList::SEntry>* _items) :
+		CFileArchive(path&& _defaultAbsolutePath, system::logger_opt_smart_ptr&& logger, std::shared_ptr<core::vector<SFileList::SEntry>> _items) :
 			IFileArchive(std::move(_defaultAbsolutePath),std::move(logger))
 		{
-			auto itemsSharedPtr = std::shared_ptr<core::vector<SFileList::SEntry>>(_items);
-			std::sort(itemsSharedPtr->begin(), itemsSharedPtr->end());
-			m_items.store(itemsSharedPtr);
+			std::sort(_items->begin(), _items->end());
+			m_items.store(_items);
 
-			const auto fileCount = itemsSharedPtr->size();
+			const auto fileCount = _items->size();
 			m_filesBuffer = (std::byte*)_NBL_ALIGNED_MALLOC(fileCount*SIZEOF_INNER_ARCHIVE_FILE, ALIGNOF_INNER_ARCHIVE_FILE);
 			m_fileFlags = (std::atomic_flag*)_NBL_ALIGNED_MALLOC(fileCount*sizeof(std::atomic_flag), alignof(std::atomic_flag));
 			for (size_t i=0u; i<fileCount; i++)

diff --git a/src/nbl/system/CMountDirectoryArchive.h → include/nbl/system/CMountDirectoryArchive.h b/src/nbl/system/CMountDirectoryArchive.h → include/nbl/system/CMountDirectoryArchive.h
diff --git a/src/nbl/builtin/template/CArchive.cpp.in b/src/nbl/builtin/template/CArchive.cpp.in
@@ -3,9 +3,10 @@
 
 using namespace @_NAMESPACE_@;
 
-static const auto k_builtinArchiveFileList = new nbl::core::vector<nbl::system::IFileArchive::SFileList::SEntry>{
+static const std::shared_ptr<nbl::core::vector<nbl::system::IFileArchive::SFileList::SEntry>> k_builtinArchiveFileList = std::make_shared<nbl::core::vector<nbl::system::IFileArchive::SFileList::SEntry>>(
+	nbl::core::vector<nbl::system::IFileArchive::SFileList::SEntry>{
 @_RESOURCES_INIT_LIST_@
-};
+});
 
 CArchive::CArchive(nbl::system::logger_opt_smart_ptr&& logger)
 	: nbl::system::CFileArchive(nbl::system::path(pathPrefix.data()),std::move(logger), k_builtinArchiveFileList)

diff --git a/src/nbl/system/CArchiveLoaderTar.cpp b/src/nbl/system/CArchiveLoaderTar.cpp
@@ -98,7 +98,8 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderTar::createArchive_impl(core:
 	if (!file || !(file->getFlags()&IFileBase::ECF_MAPPABLE))
 		return nullptr;
 
-	core::vector<IFileArchive::SFileList::SEntry>* items = new core::vector<IFileArchive::SFileList::SEntry>();
+	std::shared_ptr<core::vector<IFileArchive::SFileList::SEntry>> items = std::make_shared<core::vector<IFileArchive::SFileList::SEntry>>();
+
 	for (size_t pos=0ull; true; )
 	{
 		STarHeader fHead;

diff --git a/src/nbl/system/CArchiveLoaderTar.h b/src/nbl/system/CArchiveLoaderTar.h
@@ -14,7 +14,7 @@ class CArchiveLoaderTar final : public IArchiveLoader
 		class CArchive final : public CFileArchive
 		{
 			public:
-				CArchive(core::smart_refctd_ptr<IFile>&& _file, system::logger_opt_smart_ptr&& logger, core::vector<SFileList::SEntry>* _items) :
+				CArchive(core::smart_refctd_ptr<IFile>&& _file, system::logger_opt_smart_ptr&& logger, std::shared_ptr<core::vector<IFileArchive::SFileList::SEntry>> _items) :
 					CFileArchive(path(_file->getFileName()),std::move(logger),_items), m_file(std::move(_file)) {}
 
 			protected:

diff --git a/src/nbl/system/CArchiveLoaderZip.cpp b/src/nbl/system/CArchiveLoaderZip.cpp
@@ -106,7 +106,7 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core:
 			return nullptr;
 	}
 
-	core::vector<IFileArchive::SFileList::SEntry>* items = new core::vector<IFileArchive::SFileList::SEntry>();
+	std::shared_ptr<core::vector<IFileArchive::SFileList::SEntry>> items = std::make_shared<core::vector<IFileArchive::SFileList::SEntry>>();
 	core::vector<SZIPFileHeader> itemsMetadata;
 	// load file entries
 	{
@@ -337,7 +337,7 @@ core::smart_refctd_ptr<IFileArchive> CArchiveLoaderZip::createArchive_impl(core:
 	if (items->empty())
 		return nullptr;
 
-	return core::make_smart_refctd_ptr<CArchive>(std::move(file),core::smart_refctd_ptr(m_logger.get()),items,std::move(itemsMetadata));
+	return core::make_smart_refctd_ptr<CArchive>(std::move(file),core::smart_refctd_ptr(m_logger.get()), items, std::move(itemsMetadata));
 }
 
 #if 0

diff --git a/src/nbl/system/CArchiveLoaderZip.h b/src/nbl/system/CArchiveLoaderZip.h
@@ -39,7 +39,7 @@ class CArchiveLoaderZip final : public IArchiveLoader
 				CArchive(
 					core::smart_refctd_ptr<IFile>&& _file,
 					system::logger_opt_smart_ptr&& logger,
-					core::vector<SFileList::SEntry>* _items,
+					std::shared_ptr<core::vector<IFileArchive::SFileList::SEntry>> _items,
 					core::vector<SZIPFileHeader>&& _itemsMetadata
 				) : CFileArchive(path(_file->getFileName()),std::move(logger),_items),
 					m_file(std::move(_file)), m_itemsMetadata(std::move(_itemsMetadata)), m_password("")