VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Platform
diff options
context:
space:
mode:
authorDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 22:16:32 +0200
committerDavid Foerster <david.foerster@informatik.hu-berlin.de>2016-05-10 22:18:34 +0200
commit11716ed2dacbb104f8f59867fe66f2c0a6984291 (patch)
tree28aa448de2e790d0f40dc57799a55a9df12ee6fb /src/Platform
parent191075155835172e5596e191cf0679ff9022f0fd (diff)
downloadVeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.tar.gz
VeraCrypt-11716ed2dacbb104f8f59867fe66f2c0a6984291.zip
Remove trailing whitespace
Diffstat (limited to 'src/Platform')
-rw-r--r--src/Platform/Buffer.cpp4
-rw-r--r--src/Platform/Buffer.h2
-rw-r--r--src/Platform/Directory.h2
-rw-r--r--src/Platform/Event.cpp4
-rw-r--r--src/Platform/Event.h2
-rw-r--r--src/Platform/Exception.cpp2
-rw-r--r--src/Platform/Exception.h2
-rw-r--r--src/Platform/File.h6
-rw-r--r--src/Platform/FileCommon.cpp6
-rw-r--r--src/Platform/FileStream.h2
-rw-r--r--src/Platform/FilesystemPath.h6
-rw-r--r--src/Platform/Finally.h4
-rw-r--r--src/Platform/ForEach.h4
-rw-r--r--src/Platform/Functor.h2
-rw-r--r--src/Platform/Memory.cpp4
-rw-r--r--src/Platform/Memory.h2
-rw-r--r--src/Platform/MemoryStream.cpp2
-rw-r--r--src/Platform/MemoryStream.h2
-rw-r--r--src/Platform/Mutex.h2
-rw-r--r--src/Platform/Platform.h2
-rw-r--r--src/Platform/Platform.make2
-rw-r--r--src/Platform/PlatformBase.h2
-rw-r--r--src/Platform/PlatformTest.cpp10
-rw-r--r--src/Platform/PlatformTest.h2
-rw-r--r--src/Platform/Serializable.cpp2
-rw-r--r--src/Platform/Serializable.h8
-rw-r--r--src/Platform/Serializer.cpp18
-rw-r--r--src/Platform/Serializer.h2
-rw-r--r--src/Platform/SerializerFactory.cpp2
-rw-r--r--src/Platform/SerializerFactory.h2
-rw-r--r--src/Platform/SharedPtr.h6
-rw-r--r--src/Platform/SharedVal.h2
-rw-r--r--src/Platform/Stream.h2
-rw-r--r--src/Platform/StringConverter.cpp8
-rw-r--r--src/Platform/StringConverter.h2
-rw-r--r--src/Platform/SyncEvent.h2
-rw-r--r--src/Platform/System.h2
-rw-r--r--src/Platform/SystemException.h2
-rw-r--r--src/Platform/SystemInfo.h2
-rw-r--r--src/Platform/SystemLog.h4
-rw-r--r--src/Platform/TextReader.cpp2
-rw-r--r--src/Platform/TextReader.h2
-rw-r--r--src/Platform/Thread.h2
-rw-r--r--src/Platform/Time.h2
-rw-r--r--src/Platform/Unix/Directory.cpp4
-rw-r--r--src/Platform/Unix/File.cpp12
-rw-r--r--src/Platform/Unix/FilesystemPath.cpp4
-rw-r--r--src/Platform/Unix/Mutex.cpp2
-rw-r--r--src/Platform/Unix/Pipe.cpp4
-rw-r--r--src/Platform/Unix/Pipe.h2
-rw-r--r--src/Platform/Unix/Poller.cpp2
-rw-r--r--src/Platform/Unix/Poller.h2
-rw-r--r--src/Platform/Unix/Process.cpp18
-rw-r--r--src/Platform/Unix/Process.h4
-rw-r--r--src/Platform/Unix/SyncEvent.cpp4
-rw-r--r--src/Platform/Unix/System.h2
-rw-r--r--src/Platform/Unix/SystemException.cpp6
-rw-r--r--src/Platform/Unix/SystemInfo.cpp2
-rw-r--r--src/Platform/Unix/SystemLog.cpp2
-rw-r--r--src/Platform/Unix/Thread.cpp2
-rw-r--r--src/Platform/Unix/Time.cpp2
-rw-r--r--src/Platform/User.h2
62 files changed, 114 insertions, 114 deletions
diff --git a/src/Platform/Buffer.cpp b/src/Platform/Buffer.cpp
index 2d2a9217..4948a875 100644
--- a/src/Platform/Buffer.cpp
+++ b/src/Platform/Buffer.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -92,7 +92,7 @@ namespace VeraCrypt
return BufferPtr (DataPtr + offset, size);
}
-
+
void Buffer::Zero ()
{
if (DataSize > 0)
diff --git a/src/Platform/Buffer.h b/src/Platform/Buffer.h
index 3d2d5f53..b47907b3 100644
--- a/src/Platform/Buffer.h
+++ b/src/Platform/Buffer.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Directory.h b/src/Platform/Directory.h
index 574be3b2..89b91ad3 100644
--- a/src/Platform/Directory.h
+++ b/src/Platform/Directory.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Event.cpp b/src/Platform/Event.cpp
index d6e51182..bfa0da7c 100644
--- a/src/Platform/Event.cpp
+++ b/src/Platform/Event.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -19,7 +19,7 @@ namespace VeraCrypt
ScopeLock lock (HandlersMutex);
ConnectedHandlers.push_back (shared_ptr <EventConnectorBase> (connector.CloneNew()));
}
-
+
void Event::Disconnect (void *handler)
{
ScopeLock lock (HandlersMutex);
diff --git a/src/Platform/Event.h b/src/Platform/Event.h
index b28bc90d..5aef3621 100644
--- a/src/Platform/Event.h
+++ b/src/Platform/Event.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Exception.cpp b/src/Platform/Exception.cpp
index 31d25b88..40739edd 100644
--- a/src/Platform/Exception.cpp
+++ b/src/Platform/Exception.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Exception.h b/src/Platform/Exception.h
index 1a5769ef..0b3aab43 100644
--- a/src/Platform/Exception.h
+++ b/src/Platform/Exception.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/File.h b/src/Platform/File.h
index d23ac6b1..5bb25a01 100644
--- a/src/Platform/File.h
+++ b/src/Platform/File.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -56,7 +56,7 @@ namespace VeraCrypt
File () : FileIsOpen (false), SharedHandle (false) { }
virtual ~File ();
-
+
void AssignSystemHandle (SystemFileHandleType openFileHandle, bool sharedHandle = true)
{
if (FileIsOpen)
@@ -86,7 +86,7 @@ namespace VeraCrypt
void Write (const ConstBufferPtr &buffer) const;
void Write (const ConstBufferPtr &buffer, size_t length) const { Write (buffer.GetRange (0, length)); }
void WriteAt (const ConstBufferPtr &buffer, uint64 position) const;
-
+
protected:
void ValidateState () const;
diff --git a/src/Platform/FileCommon.cpp b/src/Platform/FileCommon.cpp
index 934211bd..a5331266 100644
--- a/src/Platform/FileCommon.cpp
+++ b/src/Platform/FileCommon.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -60,7 +60,7 @@ namespace VeraCrypt
#endif
}
}
-
+
FilePath File::GetPath () const
{
if_debug (ValidateState());
@@ -82,7 +82,7 @@ namespace VeraCrypt
offset += dataRead;
}
}
-
+
void File::ValidateState () const
{
if (!FileIsOpen)
diff --git a/src/Platform/FileStream.h b/src/Platform/FileStream.h
index 55c431ff..e64160e5 100644
--- a/src/Platform/FileStream.h
+++ b/src/Platform/FileStream.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/FilesystemPath.h b/src/Platform/FilesystemPath.h
index 83fcc5b3..145be3f8 100644
--- a/src/Platform/FilesystemPath.h
+++ b/src/Platform/FilesystemPath.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -33,7 +33,7 @@ namespace VeraCrypt
};
};
- class FilesystemPath
+ class FilesystemPath
{
public:
FilesystemPath () { }
@@ -59,7 +59,7 @@ namespace VeraCrypt
bool IsFile () const throw () { try { return GetType() == FilesystemPathType::File; } catch (...) { return false; } }
FilesystemPath ToBaseName () const;
FilesystemPath ToHostDriveOfPartition () const;
-
+
static const int MaxSize = 260;
protected:
diff --git a/src/Platform/Finally.h b/src/Platform/Finally.h
index 5fa2e904..7afd9aef 100644
--- a/src/Platform/Finally.h
+++ b/src/Platform/Finally.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -24,7 +24,7 @@ struct TC_JOIN(Finally,__LINE__) \
TC_UNUSED_VAR \
TC_JOIN(finally,__LINE__)
-// Execute code with argument 'finally_arg' when leaving scope
+// Execute code with argument 'finally_arg' when leaving scope
#define finally_do_arg(argType, arg, code) \
struct TC_JOIN(Finally,__LINE__) \
{ \
diff --git a/src/Platform/ForEach.h b/src/Platform/ForEach.h
index e0fb121f..b16da0cf 100644
--- a/src/Platform/ForEach.h
+++ b/src/Platform/ForEach.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -62,7 +62,7 @@ namespace VeraCrypt
const T ContainerCopy;
typename T::const_reverse_iterator EndIterator;
mutable typename T::const_reverse_iterator Iterator;
-
+
private:
ContainerReverse &operator= (const ContainerReverse &);
};
diff --git a/src/Platform/Functor.h b/src/Platform/Functor.h
index 9bc96949..f17801d6 100644
--- a/src/Platform/Functor.h
+++ b/src/Platform/Functor.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Memory.cpp b/src/Platform/Memory.cpp
index f84a8741..c8c04766 100644
--- a/src/Platform/Memory.cpp
+++ b/src/Platform/Memory.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -34,7 +34,7 @@ namespace VeraCrypt
return 1;
else if (size1 < size2)
return -1;
-
+
return memcmp (memory1, memory2, size1);
}
diff --git a/src/Platform/Memory.h b/src/Platform/Memory.h
index dca1e5e2..69ce2211 100644
--- a/src/Platform/Memory.h
+++ b/src/Platform/Memory.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/MemoryStream.cpp b/src/Platform/MemoryStream.cpp
index b4b17cdc..ed888f4f 100644
--- a/src/Platform/MemoryStream.cpp
+++ b/src/Platform/MemoryStream.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/MemoryStream.h b/src/Platform/MemoryStream.h
index b3d19c7a..0c38f4d2 100644
--- a/src/Platform/MemoryStream.h
+++ b/src/Platform/MemoryStream.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Mutex.h b/src/Platform/Mutex.h
index c8786952..7289c5ce 100644
--- a/src/Platform/Mutex.h
+++ b/src/Platform/Mutex.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Platform.h b/src/Platform/Platform.h
index 9e8a4cca..c1c0834b 100644
--- a/src/Platform/Platform.h
+++ b/src/Platform/Platform.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Platform.make b/src/Platform/Platform.make
index 4d142317..3c04bd1a 100644
--- a/src/Platform/Platform.make
+++ b/src/Platform/Platform.make
@@ -3,7 +3,7 @@
# Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
# by the TrueCrypt License 3.0.
#
-# Modifications and additions to the original source code (contained in this file)
+# Modifications and additions to the original source code (contained in this file)
# and all other portions of this file are Copyright (c) 2013-2016 IDRIX
# 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
diff --git a/src/Platform/PlatformBase.h b/src/Platform/PlatformBase.h
index 652069c4..bbe116f4 100644
--- a/src/Platform/PlatformBase.h
+++ b/src/Platform/PlatformBase.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/PlatformTest.cpp b/src/Platform/PlatformTest.cpp
index d6fcef3c..f5f5b1cb 100644
--- a/src/Platform/PlatformTest.cpp
+++ b/src/Platform/PlatformTest.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -162,9 +162,9 @@ namespace VeraCrypt
throw TestFailed (SRC_POS);
}
}
-
+
// shared_ptr, Mutex, ScopeLock, SyncEvent, Thread
- static struct
+ static struct
{
shared_ptr <int> SharedIntPtr;
Mutex IntMutex;
@@ -216,7 +216,7 @@ namespace VeraCrypt
TC_THREAD_PROC PlatformTest::ThreadTestProc (void *arg)
{
-
+
if (arg != (void *) &ThreadTestData)
return 0;
@@ -319,7 +319,7 @@ namespace VeraCrypt
// uint64, vector, list, string, wstring, stringstream, wstringstream
// shared_ptr, make_shared, StringConverter, foreach
list <shared_ptr <uint64> > numList;
-
+
numList.push_front (make_shared <uint64> (StringConverter::ToUInt64 (StringConverter::FromNumber ((uint64) 0xFFFFffffFFFFfffeULL))));
numList.push_front (make_shared <uint64> (StringConverter::ToUInt32 (StringConverter::GetTrailingNumber ("str2"))));
numList.push_front (make_shared <uint64> (3));
diff --git a/src/Platform/PlatformTest.h b/src/Platform/PlatformTest.h
index e4dfb7ae..4b37f3a7 100644
--- a/src/Platform/PlatformTest.h
+++ b/src/Platform/PlatformTest.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Serializable.cpp b/src/Platform/Serializable.cpp
index 8ff2c829..a9151c0d 100644
--- a/src/Platform/Serializable.cpp
+++ b/src/Platform/Serializable.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Serializable.h b/src/Platform/Serializable.h
index 64c859f6..ef1fbdbe 100644
--- a/src/Platform/Serializable.h
+++ b/src/Platform/Serializable.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -29,8 +29,8 @@ namespace VeraCrypt
virtual void Deserialize (shared_ptr <Stream> stream) = 0;
static string DeserializeHeader (shared_ptr <Stream> stream);
static Serializable *DeserializeNew (shared_ptr <Stream> stream);
-
- template <class T>
+
+ template <class T>
static shared_ptr <T> DeserializeNew (shared_ptr <Stream> stream)
{
shared_ptr <T> p (dynamic_cast <T *> (DeserializeNew (stream)));
@@ -39,7 +39,7 @@ namespace VeraCrypt
return p;
}
- template <class T>
+ template <class T>
static void DeserializeList (shared_ptr <Stream> stream, list < shared_ptr <T> > &dataList)
{
if (DeserializeHeader (stream) != string ("list<") + SerializerFactory::GetName (typeid (T)) + ">")
diff --git a/src/Platform/Serializer.cpp b/src/Platform/Serializer.cpp
index 1ac71cd1..0016694a 100644
--- a/src/Platform/Serializer.cpp
+++ b/src/Platform/Serializer.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -22,7 +22,7 @@ namespace VeraCrypt
{
uint64 size;
DataStream->ReadCompleteBuffer (BufferPtr ((byte *) &size, sizeof (size)));
-
+
if (Endian::Big (size) != sizeof (T))
throw ParameterIncorrect (SRC_POS);
@@ -49,7 +49,7 @@ namespace VeraCrypt
ValidateName (name);
data = (int32) Deserialize <uint32> ();
}
-
+
void Serializer::Deserialize (const string &name, int64 &data)
{
ValidateName (name);
@@ -200,18 +200,18 @@ namespace VeraCrypt
SerializeString (name);
Serialize (data);
}
-
+
void Serializer::Serialize (const string &name, const char *data)
{
Serialize (name, string (data));
}
-
+
void Serializer::Serialize (const string &name, int32 data)
{
SerializeString (name);
Serialize ((uint32) data);
}
-
+
void Serializer::Serialize (const string &name, int64 data)
{
SerializeString (name);
@@ -246,11 +246,11 @@ namespace VeraCrypt
SerializeString (name);
SerializeWString (data);
}
-
+
void Serializer::Serialize (const string &name, const list <string> &stringList)
{
SerializeString (name);
-
+
uint64 listSize = stringList.size();
Serialize (listSize);
@@ -261,7 +261,7 @@ namespace VeraCrypt
void Serializer::Serialize (const string &name, const list <wstring> &stringList)
{
SerializeString (name);
-
+
uint64 listSize = stringList.size();
Serialize (listSize);
diff --git a/src/Platform/Serializer.h b/src/Platform/Serializer.h
index 50065b9a..97d3f128 100644
--- a/src/Platform/Serializer.h
+++ b/src/Platform/Serializer.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SerializerFactory.cpp b/src/Platform/SerializerFactory.cpp
index aca002ca..03bf9482 100644
--- a/src/Platform/SerializerFactory.cpp
+++ b/src/Platform/SerializerFactory.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SerializerFactory.h b/src/Platform/SerializerFactory.h
index e3f7a892..29a1f655 100644
--- a/src/Platform/SerializerFactory.h
+++ b/src/Platform/SerializerFactory.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SharedPtr.h b/src/Platform/SharedPtr.h
index ce49469b..5e865470 100644
--- a/src/Platform/SharedPtr.h
+++ b/src/Platform/SharedPtr.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -21,7 +21,7 @@
namespace VeraCrypt
{
template <class T>
- class SharedPtr
+ class SharedPtr
{
public:
explicit SharedPtr ()
@@ -111,7 +111,7 @@ namespace VeraCrypt
{
Pointer = source.Pointer;
UseCount = source.UseCount;
-
+
if (UseCount)
UseCount->Increment();
}
diff --git a/src/Platform/SharedVal.h b/src/Platform/SharedVal.h
index ffdc7e84..b66deaeb 100644
--- a/src/Platform/SharedVal.h
+++ b/src/Platform/SharedVal.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Stream.h b/src/Platform/Stream.h
index 293a66f1..ac3d52d1 100644
--- a/src/Platform/Stream.h
+++ b/src/Platform/Stream.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/StringConverter.cpp b/src/Platform/StringConverter.cpp
index d5c17e88..c6934aed 100644
--- a/src/Platform/StringConverter.cpp
+++ b/src/Platform/StringConverter.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -176,7 +176,7 @@ namespace VeraCrypt
return elements;
}
-
+
string StringConverter::StripTrailingNumber (const string &str)
{
size_t start = str.find_last_not_of ("0123456789");
@@ -194,7 +194,7 @@ namespace VeraCrypt
if (ex.what() && !string (ex.what()).empty())
return ToWide (GetTypeName (typeid (ex)) + ": " + ex.what());
-
+
return ToWide (GetTypeName (typeid (ex)));
}
@@ -337,7 +337,7 @@ namespace VeraCrypt
return n;
}
-
+
string StringConverter::ToUpper (const string &str)
{
string s;
diff --git a/src/Platform/StringConverter.h b/src/Platform/StringConverter.h
index 6c412437..ad391fc4 100644
--- a/src/Platform/StringConverter.h
+++ b/src/Platform/StringConverter.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SyncEvent.h b/src/Platform/SyncEvent.h
index cea6610c..aa87cc16 100644
--- a/src/Platform/SyncEvent.h
+++ b/src/Platform/SyncEvent.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/System.h b/src/Platform/System.h
index 85385d85..918f264a 100644
--- a/src/Platform/System.h
+++ b/src/Platform/System.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SystemException.h b/src/Platform/SystemException.h
index f4e6e9ab..7ba48e17 100644
--- a/src/Platform/SystemException.h
+++ b/src/Platform/SystemException.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SystemInfo.h b/src/Platform/SystemInfo.h
index d8b29b77..89d3f448 100644
--- a/src/Platform/SystemInfo.h
+++ b/src/Platform/SystemInfo.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/SystemLog.h b/src/Platform/SystemLog.h
index eea7783f..72bd920f 100644
--- a/src/Platform/SystemLog.h
+++ b/src/Platform/SystemLog.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -23,7 +23,7 @@ namespace VeraCrypt
public:
static void WriteDebug (const string &debugMessage);
static void WriteError (const string &errorMessage);
-
+
static void WriteException (const exception &ex)
{
WriteError (string ("exception: ") + StringConverter::ToSingle (StringConverter::ToExceptionString (ex)));
diff --git a/src/Platform/TextReader.cpp b/src/Platform/TextReader.cpp
index dcb1cd16..1f4003e5 100644
--- a/src/Platform/TextReader.cpp
+++ b/src/Platform/TextReader.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/TextReader.h b/src/Platform/TextReader.h
index 91006df6..4acc6a3d 100644
--- a/src/Platform/TextReader.h
+++ b/src/Platform/TextReader.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Thread.h b/src/Platform/Thread.h
index 4ec73e5e..6e8c394f 100644
--- a/src/Platform/Thread.h
+++ b/src/Platform/Thread.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Time.h b/src/Platform/Time.h
index 9fade923..ff606876 100644
--- a/src/Platform/Time.h
+++ b/src/Platform/Time.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Directory.cpp b/src/Platform/Unix/Directory.cpp
index db81b126..9c0590cb 100644
--- a/src/Platform/Unix/Directory.cpp
+++ b/src/Platform/Unix/Directory.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -53,7 +53,7 @@ namespace VeraCrypt
while ((dirEntry = readdir (dir)) != nullptr)
{
shared_ptr <FilePath> filePath (new FilePath (string (AppendSeparator (path)) + string (dirEntry->d_name)));
-
+
if (!regularFilesOnly || filePath->IsFile())
files.push_back (filePath);
diff --git a/src/Platform/Unix/File.cpp b/src/Platform/Unix/File.cpp
index ddc7518e..5c45dcfc 100644
--- a/src/Platform/Unix/File.cpp
+++ b/src/Platform/Unix/File.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -73,7 +73,7 @@ namespace VeraCrypt
}
catch (...) // Suppress errors to allow using read-only files
{
-#ifdef DEBUG
+#ifdef DEBUG
throw;
#endif
}
@@ -132,7 +132,7 @@ namespace VeraCrypt
// HDIO_GETGEO ioctl is limited by the size of long
TextReader tr ("/sys/block/" + string (Path.ToHostDriveOfPartition().ToBaseName()) + "/" + string (Path.ToBaseName()) + "/start");
-
+
string line;
tr.ReadLine (line);
return StringConverter::ToUInt64 (line) * GetDeviceSectorSize();
@@ -199,7 +199,7 @@ namespace VeraCrypt
case CreateReadWrite:
sysFlags |= O_CREAT | O_TRUNC | O_RDWR;
break;
-
+
case CreateWrite:
sysFlags |= O_CREAT | O_TRUNC | O_WRONLY;
break;
@@ -262,7 +262,7 @@ namespace VeraCrypt
throw SystemException (SRC_POS, wstring (path));
}
break;
-
+
case ShareReadWriteIgnoreLock:
break;
@@ -339,7 +339,7 @@ namespace VeraCrypt
#endif
throw_sys_sub_if (write (FileHandle, buffer, buffer.Size()) != (ssize_t) buffer.Size(), wstring (Path));
}
-
+
void File::WriteAt (const ConstBufferPtr &buffer, uint64 position) const
{
if_debug (ValidateState());
diff --git a/src/Platform/Unix/FilesystemPath.cpp b/src/Platform/Unix/FilesystemPath.cpp
index 0beb4703..f5d59f9f 100644
--- a/src/Platform/Unix/FilesystemPath.cpp
+++ b/src/Platform/Unix/FilesystemPath.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -43,7 +43,7 @@ namespace VeraCrypt
struct stat statData;
throw_sys_sub_if (stat (StringConverter::ToSingle (path).c_str(), &statData) != 0, Path);
-
+
if (S_ISREG (statData.st_mode)) return FilesystemPathType::File;
if (S_ISDIR (statData.st_mode)) return FilesystemPathType::Directory;
if (S_ISCHR (statData.st_mode)) return FilesystemPathType::CharacterDevice;
diff --git a/src/Platform/Unix/Mutex.cpp b/src/Platform/Unix/Mutex.cpp
index 80b68ffb..a6b61de6 100644
--- a/src/Platform/Unix/Mutex.cpp
+++ b/src/Platform/Unix/Mutex.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Pipe.cpp b/src/Platform/Unix/Pipe.cpp
index 0d39adae..f427ae63 100644
--- a/src/Platform/Unix/Pipe.cpp
+++ b/src/Platform/Unix/Pipe.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -44,7 +44,7 @@ namespace VeraCrypt
int Pipe::GetReadFD ()
{
assert (ReadFileDescriptor != -1);
-
+
if (WriteFileDescriptor != -1)
{
close (WriteFileDescriptor);
diff --git a/src/Platform/Unix/Pipe.h b/src/Platform/Unix/Pipe.h
index 9bee3ec9..72af91bd 100644
--- a/src/Platform/Unix/Pipe.h
+++ b/src/Platform/Unix/Pipe.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Poller.cpp b/src/Platform/Unix/Poller.cpp
index ef202f49..6b845631 100644
--- a/src/Platform/Unix/Poller.cpp
+++ b/src/Platform/Unix/Poller.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Poller.h b/src/Platform/Unix/Poller.h
index 3dc06b98..054fe75e 100644
--- a/src/Platform/Unix/Poller.h
+++ b/src/Platform/Unix/Poller.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Process.cpp b/src/Platform/Unix/Process.cpp
index 07703649..92a8f478 100644
--- a/src/Platform/Unix/Process.cpp
+++ b/src/Platform/Unix/Process.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -53,16 +53,16 @@ namespace VeraCrypt
try
{
int argIndex = 0;
- /* Workaround for gcc 5.X issue related to the use of STL (string and list) with muliple fork calls.
- *
+ /* Workaround for gcc 5.X issue related to the use of STL (string and list) with muliple fork calls.
+ *
* The char* pointers retrieved from the elements of parameter "arguments" are no longer valid after
* a second fork is called. "arguments" was created in the parent of the current child process.
- *
- * The only solution is to copy the elements of "arguments" parameter in a local string array on this
- * child process and then use char* pointers retrieved from this local copies before calling fork.
- *
+ *
+ * The only solution is to copy the elements of "arguments" parameter in a local string array on this
+ * child process and then use char* pointers retrieved from this local copies before calling fork.
+ *
* gcc 4.x doesn't suffer from this issue.
- *
+ *
*/
string argsCopy[array_capacity (args)];
if (!execFunctor)
@@ -74,7 +74,7 @@ namespace VeraCrypt
{
argsCopy[argIndex++] = arg;
}
-
+
for (int i = 0; i < argIndex; i++)
{
args[i] = const_cast <char*> (argsCopy[i].c_str());
diff --git a/src/Platform/Unix/Process.h b/src/Platform/Unix/Process.h
index af9aa339..d19d5737 100644
--- a/src/Platform/Unix/Process.h
+++ b/src/Platform/Unix/Process.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -31,7 +31,7 @@ namespace VeraCrypt
Process ();
virtual ~Process ();
- static string Execute (const string &processName, const list <string> &arguments, int timeOut = -1, ProcessExecFunctor *execFunctor = nullptr, const Buffer *inputData = nullptr);
+ static string Execute (const string &processName, const list <string> &arguments, int timeOut = -1, ProcessExecFunctor *execFunctor = nullptr, const Buffer *inputData = nullptr);
protected:
diff --git a/src/Platform/Unix/SyncEvent.cpp b/src/Platform/Unix/SyncEvent.cpp
index 6e775493..10bbc0c9 100644
--- a/src/Platform/Unix/SyncEvent.cpp
+++ b/src/Platform/Unix/SyncEvent.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -66,7 +66,7 @@ namespace VeraCrypt
if (status != 0)
throw SystemException (SRC_POS, status);
}
-
+
Signaled = false;
}
}
diff --git a/src/Platform/Unix/System.h b/src/Platform/Unix/System.h
index e322d331..30384907 100644
--- a/src/Platform/Unix/System.h
+++ b/src/Platform/Unix/System.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/SystemException.cpp b/src/Platform/Unix/SystemException.cpp
index 6fc29176..be051cc0 100644
--- a/src/Platform/Unix/SystemException.cpp
+++ b/src/Platform/Unix/SystemException.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
@@ -37,7 +37,7 @@ namespace VeraCrypt
: Exception (message, subject), ErrorCode (errno)
{
}
-
+
void SystemException::Deserialize (shared_ptr <Stream> stream)
{
Exception::Deserialize (stream);
@@ -49,7 +49,7 @@ namespace VeraCrypt
{
return ErrorCode != 0;
}
-
+
void SystemException::Serialize (shared_ptr <Stream> stream) const
{
Exception::Serialize (stream);
diff --git a/src/Platform/Unix/SystemInfo.cpp b/src/Platform/Unix/SystemInfo.cpp
index abf5a393..c3e3ab38 100644
--- a/src/Platform/Unix/SystemInfo.cpp
+++ b/src/Platform/Unix/SystemInfo.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/SystemLog.cpp b/src/Platform/Unix/SystemLog.cpp
index 93fb4e35..88027e40 100644
--- a/src/Platform/Unix/SystemLog.cpp
+++ b/src/Platform/Unix/SystemLog.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Thread.cpp b/src/Platform/Unix/Thread.cpp
index 5d7fe2ea..2d9fae09 100644
--- a/src/Platform/Unix/Thread.cpp
+++ b/src/Platform/Unix/Thread.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/Unix/Time.cpp b/src/Platform/Unix/Time.cpp
index f30058e4..e98cea69 100644
--- a/src/Platform/Unix/Time.cpp
+++ b/src/Platform/Unix/Time.cpp
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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
diff --git a/src/Platform/User.h b/src/Platform/User.h
index 34c00527..ae7c179f 100644
--- a/src/Platform/User.h
+++ b/src/Platform/User.h
@@ -3,7 +3,7 @@
Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
by the TrueCrypt License 3.0.
- Modifications and additions to the original source code (contained in this file)
+ Modifications and additions to the original source code (contained in this file)
and all other portions of this file are Copyright (c) 2013-2016 IDRIX
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