Code style fixes
Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>
diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index f11a0b8..8fb7f9e 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -57,12 +57,12 @@
* These constants are guaranteed to be the same, though, so we suppress the
* warning when including intsafe.h.
*/
-#pragma warning( push )
-#pragma warning( disable : 4005 )
+#pragma warning(push)
+#pragma warning(disable : 4005)
#endif
#include <intsafe.h>
#if defined(_MSC_VER) && _MSC_VER <= 1600
-#pragma warning( pop )
+#pragma warning(pop)
#endif
int mbedtls_platform_entropy_poll(void *data, unsigned char *output, size_t len,
@@ -77,14 +77,13 @@
* 64-bit Windows platforms. Ensure len's value can be safely converted into
* a ULONG.
*/
- if ( FAILED( SizeTToULong( len, &len_as_ulong ) ) )
- {
- return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+ if (FAILED(SizeTToULong(len, &len_as_ulong))) {
+ return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
}
- if ( !BCRYPT_SUCCESS( BCryptGenRandom( NULL, output, len_as_ulong, BCRYPT_USE_SYSTEM_PREFERRED_RNG ) ) )
- {
- return( MBEDTLS_ERR_ENTROPY_SOURCE_FAILED );
+ if (!BCRYPT_SUCCESS(BCryptGenRandom(NULL, output, len_as_ulong,
+ BCRYPT_USE_SYSTEM_PREFERRED_RNG))) {
+ return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
}
*olen = len;
diff --git a/library/x509_crt.c b/library/x509_crt.c
index d9df4b2..d4a6dbb 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -67,12 +67,12 @@
* These constants are guaranteed to be the same, though, so we suppress the
* warning when including intsafe.h.
*/
-#pragma warning( push )
-#pragma warning( disable : 4005 )
+#pragma warning(push )
+#pragma warning(disable : 4005)
#endif
#include <intsafe.h>
#if defined(_MSC_VER) && _MSC_VER <= 1600
-#pragma warning( pop )
+#pragma warning(pop)
#endif
#else
#include <time.h>
@@ -1570,8 +1570,9 @@
p = filename + len;
filename[len++] = '*';
- if (FAILED (SizeTToInt(len, &length_as_int)))
- return(MBEDTLS_ERR_X509_FILE_IO_ERROR);
+ if (FAILED(SizeTToInt(len, &length_as_int))) {
+ return MBEDTLS_ERR_X509_FILE_IO_ERROR;
+ }
/*
* Note this function uses the code page CP_ACP, and assumes the incoming
@@ -1600,15 +1601,15 @@
continue;
}
- if (FAILED(SizeTToInt(wcslen(file_data.cFileName), &length_as_int)))
- return(MBEDTLS_ERR_X509_FILE_IO_ERROR);
+ if (FAILED(SizeTToInt(wcslen(file_data.cFileName), &length_as_int))) {
+ return MBEDTLS_ERR_X509_FILE_IO_ERROR;
+ }
w_ret = WideCharToMultiByte(CP_ACP, 0, file_data.cFileName,
length_as_int,
p, (int) len - 1,
NULL, NULL);
- if(w_ret == 0)
- {
+ if (w_ret == 0) {
ret = MBEDTLS_ERR_X509_FILE_IO_ERROR;
goto cleanup;
}
diff --git a/scripts/data_files/vs2013-app-template.vcxproj b/scripts/data_files/vs2013-app-template.vcxproj
index 666c639..eca9691 100644
--- a/scripts/data_files/vs2013-app-template.vcxproj
+++ b/scripts/data_files/vs2013-app-template.vcxproj
@@ -162,8 +162,8 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
- <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
+ <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/scripts/data_files/vs2013-main-template.vcxproj b/scripts/data_files/vs2013-main-template.vcxproj
index 6f1b5da..c2d65cf 100644
--- a/scripts/data_files/vs2013-main-template.vcxproj
+++ b/scripts/data_files/vs2013-main-template.vcxproj
@@ -92,7 +92,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ShowProgress>NotSet</ShowProgress>
- <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
@@ -110,7 +110,7 @@
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ShowProgress>NotSet</ShowProgress>
- <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>Debug</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
@@ -131,8 +131,8 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalLibraryDirectories>Release</AdditionalLibraryDirectories>
- <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
- </Link>
+ <AdditionalDependencies>bcrypt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>