From 5852aac2730769a545d7c3fe4deb93b138ad0a55 Mon Sep 17 00:00:00 2001
From: ohyzha <oleksii.hyzha.ext@madvoxel.com>
Date: Sun, 22 Dec 2024 13:54:01 +0200
Subject: [PATCH] minor refactoring

---
 openVulkanoCpp/Host/ExeAppendedZipResourceLoader.cpp |  3 +--
 .../Windows/ExeAppendedZipResourceLoaderWindows.cpp  |  2 +-
 openVulkanoCpp/IO/Archive/ArchiveReader.cpp          | 12 +++++++-----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.cpp b/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.cpp
index a9c311d..93a2365 100644
--- a/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.cpp
+++ b/openVulkanoCpp/Host/ExeAppendedZipResourceLoader.cpp
@@ -15,8 +15,7 @@ namespace OpenVulkano
 {
 	Array<char> ExeAppendedZipResourceLoader::GetResource(const std::string& resourceName)
 	{
-		Array<char> zipData = Utils::ReadFile(GetCurrentExecutablePath());
-		ArchiveReader reader(zipData.Data(), zipData.Size(), nullptr, ArchiveType::ZIP);
+		ArchiveReader reader(GetCurrentExecutablePath(), nullptr, ArchiveType::ZIP);
 		if (auto data = reader.GetFile(resourceName))
 		{
 			return data->second;
diff --git a/openVulkanoCpp/Host/Windows/ExeAppendedZipResourceLoaderWindows.cpp b/openVulkanoCpp/Host/Windows/ExeAppendedZipResourceLoaderWindows.cpp
index 8e50bda..8800276 100644
--- a/openVulkanoCpp/Host/Windows/ExeAppendedZipResourceLoaderWindows.cpp
+++ b/openVulkanoCpp/Host/Windows/ExeAppendedZipResourceLoaderWindows.cpp
@@ -18,7 +18,7 @@ namespace OpenVulkano
 	{ 
 		std::string exe(MAX_PATH, '\0');
 		DWORD len = GetModuleFileNameA(NULL, exe.data(), MAX_PATH);
-		exe.resize(std::max<size_t>(len, exe.size()));
+		exe.resize(len);
 		return exe;
 	}
 
diff --git a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp
index 0ce6a92..b392842 100644
--- a/openVulkanoCpp/IO/Archive/ArchiveReader.cpp
+++ b/openVulkanoCpp/IO/Archive/ArchiveReader.cpp
@@ -51,8 +51,7 @@ namespace OpenVulkano
 			m_archive = archive_read_new();
 		}
 		ChkErr(archive_read_support_filter_all(m_archive));
-		std::function<int(archive*)> pFunc = GetCurrentFormatReadFunc();
-		ChkErr(pFunc(m_archive));
+		ChkErr(GetCurrentFormatReadFunc()(m_archive));
 		m_open = true;
 	}
 
@@ -295,10 +294,13 @@ namespace OpenVulkano
 	{
 		while (HasNext())
 		{
-			const std::pair<FileDescription, Array<char>> info = *GetNextFile();
-			if (info.first.path == path)
+			if (path == archive_entry_pathname(m_archiveEntry))
 			{
-				return info;
+				return GetNextFile();
+			}
+			if (archive_read_next_header(m_archive, &m_archiveEntry) != ARCHIVE_OK)
+			{
+				return {};
 			}
 		}
 		return {};