From fc37cc4a02ed13d1a73b941a9f80975600fd1b99 Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 20:20:14 +0200
Subject: Normalize all line terminators

---
 src/Platform/Memory.cpp | 104 ++++++++++++++++++++++++------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

(limited to 'src/Platform/Memory.cpp')

diff --git a/src/Platform/Memory.cpp b/src/Platform/Memory.cpp
index 7a543a8c..f84a8741 100644
--- a/src/Platform/Memory.cpp
+++ b/src/Platform/Memory.cpp
@@ -8,55 +8,55 @@
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
-*/
-
-#include "Common/Tcdefs.h"
-#include "Memory.h"
-#include "Exception.h"
-
-namespace VeraCrypt
-{
-	void *Memory::Allocate (std::size_t size)
-	{
-		if (size < 1)
-			throw ParameterIncorrect (SRC_POS);
-
-		void *bufPtr = malloc (size);
-		if (!bufPtr)
-			throw bad_alloc();
-
-		return bufPtr;
-	}
-
-	int Memory::Compare (const void *memory1, size_t size1, const void *memory2, size_t size2)
-	{
-		if (size1 > size2)
-			return 1;
-		else if (size1 < size2)
-			return -1;
-		
-		return memcmp (memory1, memory2, size1);
-	}
-
-	void Memory::Copy (void *memoryDestination, const void *memorySource, size_t size)
-	{
-		assert (memoryDestination != nullptr && memorySource != nullptr);
-		memcpy (memoryDestination, memorySource, size);
-	}
-
-	void Memory::Erase (void *memory, size_t size)
-	{
-		burn (memory, size);
-	}
-
-	void Memory::Zero (void *memory, size_t size)
-	{
-		memset (memory, 0, size);
-	}
-
-	void Memory::Free (void *memory)
-	{
-		assert (memory != nullptr);
-		free (memory);
-	}
-}
+*/
+
+#include "Common/Tcdefs.h"
+#include "Memory.h"
+#include "Exception.h"
+
+namespace VeraCrypt
+{
+	void *Memory::Allocate (std::size_t size)
+	{
+		if (size < 1)
+			throw ParameterIncorrect (SRC_POS);
+
+		void *bufPtr = malloc (size);
+		if (!bufPtr)
+			throw bad_alloc();
+
+		return bufPtr;
+	}
+
+	int Memory::Compare (const void *memory1, size_t size1, const void *memory2, size_t size2)
+	{
+		if (size1 > size2)
+			return 1;
+		else if (size1 < size2)
+			return -1;
+		
+		return memcmp (memory1, memory2, size1);
+	}
+
+	void Memory::Copy (void *memoryDestination, const void *memorySource, size_t size)
+	{
+		assert (memoryDestination != nullptr && memorySource != nullptr);
+		memcpy (memoryDestination, memorySource, size);
+	}
+
+	void Memory::Erase (void *memory, size_t size)
+	{
+		burn (memory, size);
+	}
+
+	void Memory::Zero (void *memory, size_t size)
+	{
+		memset (memory, 0, size);
+	}
+
+	void Memory::Free (void *memory)
+	{
+		assert (memory != nullptr);
+		free (memory);
+	}
+}
-- 
cgit v1.2.3