GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'ArchiveReader bugfixes & tests for ArchiveReader/ArchiveWriter' (#144) from archive_reader_bugfix into master

Browse Source 
Reviewed-on: https://git.madvoxel.net/OpenVulkano/OpenVulkano/pulls/144
Reviewed-by: Georg Hagen <georg.hagen@madvoxel.com>
This commit is contained in:
Vladyslav_Baranovskyi_EXT
2024-10-14 14:48:40 +02:00
parent f010eb474e b476563698
commit f5d5940f98
5 changed files with 344 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
openVulkanoCpp/IO/Archive/ArchiveReader.cpp
View File

@@ -57,6 +57,14 @@ namespace OpenVulkano
bool ArchiveReader::Open(const char* archiveFile)
{
if (archiveFile[0] == '\0')
{
if (m_logger)
{
m_logger->error("Unable to open archive file with an empty name!");
}
return false;
}
PrepOpen();
ChkErr(archive_read_open_filename(m_archive, archiveFile, BUFFER_SIZE));
ReadNextHeader();

2
openVulkanoCpp/IO/Archive/LibArchiveHelper.hpp
View File

@@ -88,7 +88,7 @@ namespace OpenVulkano
else if (archiveResult <= ARCHIVE_FAILED) lvl = spdlog::level::level_enum::err;
const char* errorString = archive_error_string(arch);
if (logger) logger->log(lvl, errorString ? errorString : "Unknown error while handling archive");
if (archiveResult == ARCHIVE_FAILED) throw std::runtime_error(errorString);
if (archiveResult == ARCHIVE_FAILED || archiveResult == ARCHIVE_FATAL) throw std::runtime_error(errorString);
return false;
}
}

2
openVulkanoCpp/IO/FileDescription.hpp
View File

@@ -19,7 +19,7 @@ namespace OpenVulkano
std::string path;
size_t size;
std::filesystem::perms permissions;
time_t createTime, modTime;
time_t createTime = {}, modTime = {};
static FileDescription MakeDescriptionForFile(const char* path, size_t size)
{