From 9ad4aeb20f8ca3666537f37a89318a14dbca79ad Mon Sep 17 00:00:00 2001 From: = Date: Thu, 4 Jul 2013 13:26:33 +0200 Subject: [PATCH 1/3] Fix a while loop in Directory::copy function (semicolon removed). Former-commit-id: 6f27d4f85f32a3ee03321befaac3d652fd8a7e23 --- src/Nazara/Core/Directory.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Nazara/Core/Directory.cpp b/src/Nazara/Core/Directory.cpp index 95bfe7a82..cd1925e8f 100644 --- a/src/Nazara/Core/Directory.cpp +++ b/src/Nazara/Core/Directory.cpp @@ -215,7 +215,7 @@ bool NzDirectory::Copy(const NzString& sourcePath, const NzString& destPath) return false; } - while (dir.NextResult(true)); + while (dir.NextResult(true)) { if (dir.IsResultDirectory()) { From 644aa1e5469d298067d557c78311a30cefa2f910 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 4 Jul 2013 13:28:28 +0200 Subject: [PATCH 2/3] [POSIX] Fix NzFileImpl::copy return value. Former-commit-id: fdb2ed820a4e504c3e1872a9a9a19dea9ac2d351 --- src/Nazara/Core/Posix/FileImpl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Nazara/Core/Posix/FileImpl.cpp b/src/Nazara/Core/Posix/FileImpl.cpp index 22b6e3a38..d033f105e 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) From d0f184b0bcce26f9e6c02d5494ef3b5a0111e748 Mon Sep 17 00:00:00 2001 From: = Date: Thu, 4 Jul 2013 13:37:58 +0200 Subject: [PATCH 3/3] Fix warning in Core/Hash/Internal.cpp (with clang). Former-commit-id: cae3d27e8cea49732395a341a744a7ffd9a650ab --- src/Nazara/Core/Hash/SHA/Internal.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/Nazara/Core/Hash/SHA/Internal.cpp b/src/Nazara/Core/Hash/SHA/Internal.cpp index d03ad9b9c..5e47497f5 100644 --- a/src/Nazara/Core/Hash/SHA/Internal.cpp +++ b/src/Nazara/Core/Hash/SHA/Internal.cpp @@ -1031,8 +1031,6 @@ void SHA512_End(SHA_CTX* context, nzUInt8* digest) #endif } - /* Zero out state data */ - std::memset(context, 0, sizeof(context)); } @@ -1071,6 +1069,4 @@ void SHA384_End(SHA_CTX* context, nzUInt8* digest) #endif } - /* Zero out state data */ - std::memset(context, 0, sizeof(context)); }