zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-05-17 07:21:43 +00:00
Code Activity

chore: update all logging to use centralized logging component

Browse Source
This commit is contained in:
Jan Laupetin
2025-09-10 19:52:42 +02:00
parent 1bf4033f41
commit 02f20f09b6
161 changed files with 824 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ZoneCommon/Zone/XChunk/XChunkProcessorInflate.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
#include "XChunkProcessorInflate.h"
#include "Utils/Logging/Log.h"
#include "XChunkException.h"
#include <format>
@@ -26,7 +27,7 @@ size_t XChunkProcessorInflate::Process(unsigned streamNumber, const uint8_t* inp
ret = inflate(&stream, Z_FULL_FLUSH);
if (ret != Z_STREAM_END)
{
std::cerr << std::format("inflate of stream failed with error code {}: {}\n", streamNumber, ret, stream.msg);
con::error("inflate of stream failed with error code {}: {}", streamNumber, ret, stream.msg);
throw XChunkException(std::format("Zone has invalid or unsupported compression: {}", stream.msg));
}
src/ZoneCommon/Zone/XChunk/XChunkProcessorLzxDecompress.cpp
+7 -5
View File
@@ -1,5 +1,7 @@
#include "XChunkProcessorLzxDecompress.h"
#include "Utils/Logging/Log.h"
#include <cstring>
#include <format>
#include <iostream>
@@ -22,7 +24,7 @@ namespace
void LogErrorHeaderSpace(size_t remainingInputSize)
{
std::cerr << std::format("XMemCompress: Not enough data for header: {}\n", remainingInputSize);
con::error("XMemCompress: Not enough data for header: {}", remainingInputSize);
}
} // namespace
@@ -99,19 +101,19 @@ size_t XChunkProcessorLzxDecompress::Process(
if (srcSize == 0 || dstSize == 0)
{
// Other implementations do not handle this as a failure, game code suggests otherwise though
std::cerr << std::format("XMemCompress: EOF: {} {}, {}\n", srcSize, dstSize, curInputSize);
con::error("XMemCompress: EOF: {} {}, {}", srcSize, dstSize, curInputSize);
return curOutputOffset;
}
if (static_cast<size_t>(srcSize) + suffixSize > curInputSize)
{
std::cerr << std::format("XMemCompress: block size bigger than remaining data: {} > {}\n", srcSize, curInputSize);
con::error("XMemCompress: block size bigger than remaining data: {} > {}", srcSize, curInputSize);
return curOutputOffset;
}
if (dstSize > curOutputSize)
{
std::cerr << std::format("XMemCompress: output size bigger than remaining data: {} > {}\n", dstSize, curOutputSize);
con::error("XMemCompress: output size bigger than remaining data: {} > {}", dstSize, curOutputSize);
return curOutputOffset;
}
@@ -123,7 +125,7 @@ size_t XChunkProcessorLzxDecompress::Process(
if (ret != DECR_OK)
{
std::cerr << std::format("XMemCompress: lzx decompression failed: {}\n", ret);
con::error("XMemCompress: lzx decompression failed: {}", ret);
return curOutputOffset;
}
}