minor refactoring

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 {};