diff --git a/include/Nazara/Core/File.hpp b/include/Nazara/Core/File.hpp index c3dde211c..d0a66e09c 100644 --- a/include/Nazara/Core/File.hpp +++ b/include/Nazara/Core/File.hpp @@ -68,7 +68,6 @@ namespace Nz bool SetCursorPos(CursorPosition pos, Int64 offset = 0); bool SetCursorPos(UInt64 offset) override; - void SetEndianness(Endianness endianness); bool SetFile(const String& filePath); using OutputStream::Write; diff --git a/src/Nazara/Core/File.cpp b/src/Nazara/Core/File.cpp index cc5674d2f..7ad8669e0 100644 --- a/src/Nazara/Core/File.cpp +++ b/src/Nazara/Core/File.cpp @@ -561,8 +561,8 @@ namespace Nz char buffer[NAZARA_CORE_FILE_BUFFERSIZE]; while (remainingSize > 0) { - unsigned int size = static_cast(std::min(remainingSize, static_cast(NAZARA_CORE_FILE_BUFFERSIZE))); - if (file.Read(&buffer[0], sizeof(char), size) != sizeof(char)*size) + std::size_t size = std::min(static_cast(remainingSize), NAZARA_CORE_FILE_BUFFERSIZE); + if (file.Read(&buffer[0], size) != size) { NazaraError("Unable to read file"); return false; diff --git a/tests/Engine/Core/File.cpp b/tests/Engine/Core/File.cpp index ae29407cb..c00af74d1 100644 --- a/tests/Engine/Core/File.cpp +++ b/tests/Engine/Core/File.cpp @@ -17,7 +17,7 @@ SCENARIO("File", "[CORE][FILE]") Nz::ByteArray byteArray(message, 11); file.Write("Test String"); file.Write(byteArray); - file.Write(message, sizeof(char), 11); + file.Write(message, 11); } AND_THEN("We can retrieve 3 times 'Test String'") @@ -27,7 +27,7 @@ SCENARIO("File", "[CORE][FILE]") message[11] = '\0'; REQUIRE(Nz::String(message) == "Test String"); - REQUIRE(file.Read(message, sizeof(char), 11) == 11); + REQUIRE(file.Read(message, 11) == 11); message[11] = '\0'; REQUIRE(Nz::String(message) == "Test String"); }