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/Finally.h | 80 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

(limited to 'src/Platform/Finally.h')

diff --git a/src/Platform/Finally.h b/src/Platform/Finally.h
index c411fc4b..5fa2e904 100644
--- a/src/Platform/Finally.h
+++ b/src/Platform/Finally.h
@@ -8,43 +8,43 @@
  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.
-*/
-
-#ifndef TC_HEADER_Platform_Finally
-#define TC_HEADER_Platform_Finally
-
-#include "PlatformBase.h"
-
-// Execute code when leaving scope
-#define finally_do(code) \
-struct TC_JOIN(Finally,__LINE__) \
-{ \
-	TC_JOIN(~Finally,__LINE__) () { try { code } catch (...) { } } \
-} \
-TC_UNUSED_VAR \
-TC_JOIN(finally,__LINE__)
-
-// Execute code with argument 'finally_arg' when leaving scope 
-#define finally_do_arg(argType, arg, code) \
-struct TC_JOIN(Finally,__LINE__) \
-{ \
-	TC_JOIN(Finally,__LINE__) (argType a) : finally_arg (a) { } \
-	TC_JOIN(~Finally,__LINE__) () { try { code } catch (...) { } } \
-	argType finally_arg; \
-} \
-TC_UNUSED_VAR \
-TC_JOIN(finally,__LINE__) (arg)
-
-#define finally_do_arg2(argType, arg, argType2, arg2, code) \
-struct TC_JOIN(Finally,__LINE__) \
-{ \
-	TC_JOIN(Finally,__LINE__) (argType a, argType2 a2) : finally_arg (a), finally_arg2 (a2) { } \
-	TC_JOIN(~Finally,__LINE__) () { try { code } catch (...) { } } \
-	argType finally_arg; \
-	argType2 finally_arg2; \
-} \
-TC_UNUSED_VAR \
-TC_JOIN(finally,__LINE__) (arg, arg2)
-
-
-#endif // TC_HEADER_Platform_Finally
+*/
+
+#ifndef TC_HEADER_Platform_Finally
+#define TC_HEADER_Platform_Finally
+
+#include "PlatformBase.h"
+
+// Execute code when leaving scope
+#define finally_do(code) \
+struct TC_JOIN(Finally,__LINE__) \
+{ \
+	TC_JOIN(~Finally,__LINE__) () { try { code } catch (...) { } } \
+} \
+TC_UNUSED_VAR \
+TC_JOIN(finally,__LINE__)
+
+// Execute code with argument 'finally_arg' when leaving scope 
+#define finally_do_arg(argType, arg, code) \
+struct TC_JOIN(Finally,__LINE__) \
+{ \
+	TC_JOIN(Finally,__LINE__) (argType a) : finally_arg (a) { } \
+	TC_JOIN(~Finally,__LINE__) () { try { code } catch (...) { } } \
+	argType finally_arg; \
+} \
+TC_UNUSED_VAR \
+TC_JOIN(finally,__LINE__) (arg)
+
+#define finally_do_arg2(argType, arg, argType2, arg2, code) \
+struct TC_JOIN(Finally,__LINE__) \
+{ \
+	TC_JOIN(Finally,__LINE__) (argType a, argType2 a2) : finally_arg (a), finally_arg2 (a2) { } \
+	TC_JOIN(~Finally,__LINE__) () { try { code } catch (...) { } } \
+	argType finally_arg; \
+	argType2 finally_arg2; \
+} \
+TC_UNUSED_VAR \
+TC_JOIN(finally,__LINE__) (arg, arg2)
+
+
+#endif // TC_HEADER_Platform_Finally
-- 
cgit v1.2.3


From 11716ed2dacbb104f8f59867fe66f2c0a6984291 Mon Sep 17 00:00:00 2001
From: David Foerster <david.foerster@informatik.hu-berlin.de>
Date: Tue, 10 May 2016 22:16:32 +0200
Subject: Remove trailing whitespace

---
 src/Platform/Finally.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Platform/Finally.h')

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__) \
 { \
-- 
cgit v1.2.3