From dbbbde0575803f139444a9e5c38b67d8a6b39ce5 Mon Sep 17 00:00:00 2001 From: Lynix Date: Sun, 11 Aug 2013 15:53:53 +0200 Subject: [PATCH] Fixed POSIX support for NazaraCore (Close #15) Former-commit-id: 7fee4f65f1306698a8e399a7d4b0593b68929d33 --- src/Nazara/Core/Directory.cpp | 2 +- src/Nazara/Core/Hash/SHA/Internal.cpp | 6 ------ src/Nazara/Core/Posix/FileImpl.cpp | 1 + 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Nazara/Core/Directory.cpp b/src/Nazara/Core/Directory.cpp index 9aa36fab3..1ac5b6c63 100644 --- a/src/Nazara/Core/Directory.cpp +++ b/src/Nazara/Core/Directory.cpp @@ -224,7 +224,7 @@ bool NzDirectory::Copy(const NzString& sourcePath, const NzString& destPath) return false; } - while (dir.NextResult(true)); + while (dir.NextResult(true)) { if (dir.IsResultDirectory()) { diff --git a/src/Nazara/Core/Hash/SHA/Internal.cpp b/src/Nazara/Core/Hash/SHA/Internal.cpp index 4b58a4eee..b63c31925 100644 --- a/src/Nazara/Core/Hash/SHA/Internal.cpp +++ b/src/Nazara/Core/Hash/SHA/Internal.cpp @@ -1031,9 +1031,6 @@ void SHA512_End(SHA_CTX* context, nzUInt8* digest) std::memcpy(d, context->s512.state, SHA512_DIGEST_LENGTH); #endif } - - /* Zero out state data */ - std::memset(context, 0, sizeof(SHA_CTX)); } @@ -1071,7 +1068,4 @@ void SHA384_End(SHA_CTX* context, nzUInt8* digest) std::memcpy(d, context->s512.state, SHA384_DIGEST_LENGTH); #endif } - - /* Zero out state data */ - std::memset(context, 0, sizeof(SHA_CTX)); } diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp index 57d8e9449..60fbb8765 100644 --- a/src/Nazara/Core/Posix/FileImpl.cpp +++ b/src/Nazara/Core/Posix/FileImpl.cpp @@ -174,6 +174,7 @@ bool NzFileImpl::Copy(const NzString& sourcePath, const NzString& targetPath) close(fd1); close(fd2); + return true; } bool NzFileImpl::Delete(const NzString& filePath)