VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Platform/Memory.cpp
diff options
context:
space:
mode:
authorDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 18:20:14 (GMT)
committerDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 18:20:14 (GMT)
commitfc37cc4a02ed13d1a73b941a9f80975600fd1b99 (patch)
treead9e5ac81111402b5c47dc06944cc5243824c4b5 /src/Platform/Memory.cpp
parent98b04198c6ea5bc07cca50956809068adf1fea82 (diff)
downloadVeraCrypt-fc37cc4a02ed13d1a73b941a9f80975600fd1b99.zip
VeraCrypt-fc37cc4a02ed13d1a73b941a9f80975600fd1b99.tar.gz
Normalize all line terminators
Diffstat (limited to 'src/Platform/Memory.cpp')
-rw-r--r--src/Platform/Memory.cpp104
1 files changed, 52 insertions, 52 deletions
diff --git a/src/Platform/Memory.cpp b/src/Platform/Memory.cpp
index 7a543a8..f84a874 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);
+ }
+}