From 6bb2c697825f65adbbbe96819dc64843c7a8026f Mon Sep 17 00:00:00 2001 From: Aaron Date: Thu, 13 Aug 2015 10:53:09 -0700 Subject: [PATCH] New line for { --- src/impl/getcomputername.cpp | 15 ++++++++----- src/tests/test-getcomputername.cpp | 36 ++++++++++++++++++++---------- 2 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/impl/getcomputername.cpp b/src/impl/getcomputername.cpp index 801c4000ba..f930dc890d 100644 --- a/src/impl/getcomputername.cpp +++ b/src/impl/getcomputername.cpp @@ -68,7 +68,8 @@ BOOL GetComputerNameW(WCHAR_T* lpBuffer, LPDWORD lpnSize) errno = 0; // Check parameters - if (!lpBuffer || !lpnSize) { + if (!lpBuffer || !lpnSize) + { errno = ERROR_INVALID_PARAMETER; return 0; } @@ -76,7 +77,8 @@ BOOL GetComputerNameW(WCHAR_T* lpBuffer, LPDWORD lpnSize) // Select locale from environment setlocale(LC_ALL, ""); // Check that locale is UTF-8 - if (nl_langinfo(CODESET) != utf8) { + if (nl_langinfo(CODESET) != utf8) + { errno = ERROR_BAD_ENVIRONMENT; return 0; } @@ -85,8 +87,10 @@ BOOL GetComputerNameW(WCHAR_T* lpBuffer, LPDWORD lpnSize) std::string computername(HOST_NAME_MAX, '\0'); int err = gethostname(&computername[0], computername.size()); // Map errno to Win32 Error Codes - if (err != 0) { - switch (errno) { + if (err != 0) + { + switch (errno) + { case EMFILE: case ENFILE: errno = ERROR_TOO_MANY_OPEN_FILES; @@ -127,7 +131,8 @@ BOOL GetComputerNameW(WCHAR_T* lpBuffer, LPDWORD lpnSize) const DWORD size = computername16.length(); //Check if parameters passed enough buffer space - if (size > *lpnSize) { + if (size > *lpnSize) + { errno = ERROR_INSUFFICIENT_BUFFER; // Set lpnSize if buffer is too small to inform user // of necessary size diff --git a/src/tests/test-getcomputername.cpp b/src/tests/test-getcomputername.cpp index 93cbfe71d5..a566d83ccb 100644 --- a/src/tests/test-getcomputername.cpp +++ b/src/tests/test-getcomputername.cpp @@ -13,7 +13,8 @@ #include "getcomputername.h" //! Test fixture for GetComputerNameTest -class GetComputerNameTest : public ::testing::Test { +class GetComputerNameTest : public ::testing::Test +{ protected: DWORD lpnSize; std::vector lpBuffer; @@ -22,21 +23,24 @@ protected: DWORD expectedSize; //Get expected result from using linux call - GetComputerNameTest(){ + GetComputerNameTest() + { char hostname[HOST_NAME_MAX]; BOOL host = gethostname(hostname, sizeof hostname); expectedComputerName = hostname; expectedSize = expectedComputerName.length() + 1; } - void TestWithSize(DWORD size) { + void TestWithSize(DWORD size) + { lpnSize = size; // allocate a DWORD buffer to receive computername lpBuffer.assign(lpnSize, '\0'); result = GetComputerNameW(&lpBuffer[0], &lpnSize); } - void TestSuccess() { + void TestSuccess() + { SCOPED_TRACE(""); //! Returns TRUE on success. @@ -62,7 +66,8 @@ protected: EXPECT_EQ(expectedComputerName, computername); } - void TestInvalidParameter() { + void TestInvalidParameter() + { SCOPED_TRACE(""); // returns 0 on failure @@ -72,7 +77,8 @@ protected: EXPECT_EQ(errno, ERROR_INVALID_PARAMETER); } - void TestInsufficientBuffer() { + void TestInsufficientBuffer() + { SCOPED_TRACE(""); // returns 0 on failure @@ -86,7 +92,8 @@ protected: } }; -TEST_F(GetComputerNameTest, BufferAsNullButNotBufferSize) { +TEST_F(GetComputerNameTest, BufferAsNullButNotBufferSize) +{ lpnSize = 1; result = GetComputerNameW(NULL, &lpnSize); TestInvalidParameter(); @@ -94,30 +101,35 @@ TEST_F(GetComputerNameTest, BufferAsNullButNotBufferSize) { EXPECT_EQ(1, lpnSize); } -TEST_F(GetComputerNameTest, BufferSizeAsNullButNotBuffer) { +TEST_F(GetComputerNameTest, BufferSizeAsNullButNotBuffer) +{ lpBuffer.push_back('\0'); result = GetComputerNameW(&lpBuffer[0], NULL); TestInvalidParameter(); } -TEST_F(GetComputerNameTest, BufferSizeAsZero) { +TEST_F(GetComputerNameTest, BufferSizeAsZero) +{ TestWithSize(0); EXPECT_EQ(errno, ERROR_INVALID_PARAMETER); } -TEST_F(GetComputerNameTest, BufferSizeAsUserNameMinusOne) { +TEST_F(GetComputerNameTest, BufferSizeAsUserNameMinusOne) +{ // the buffer is also too small TestWithSize(expectedComputerName.size()-1); TestInsufficientBuffer(); } -TEST_F(GetComputerNameTest, BufferSizeAsUserNamePlusOne) { +TEST_F(GetComputerNameTest, BufferSizeAsUserNamePlusOne) +{ // the buffer is exactly big enough TestWithSize(expectedComputerName.size()+1); TestSuccess(); } -TEST_F(GetComputerNameTest, BufferSizeAsLoginNameMax) { +TEST_F(GetComputerNameTest, BufferSizeAsLoginNameMax) +{ // the buffer larger than needed TestWithSize(HOST_NAME_MAX); TestSuccess();