From 0245ab771ee6d460e859ed59acc05095bbbc6e05 Mon Sep 17 00:00:00 2001 From: Aaron Katz Date: Thu, 9 Apr 2015 15:16:37 -0700 Subject: [PATCH] changed spacing and using std::string instead of TCHAR --- src/impl/getcomputername.cpp | 12 ++++++------ src/tests/test-getcomputername.cpp | 15 +++++++-------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/impl/getcomputername.cpp b/src/impl/getcomputername.cpp index 66a34e67ef..1ec69110c2 100644 --- a/src/impl/getcomputername.cpp +++ b/src/impl/getcomputername.cpp @@ -3,10 +3,10 @@ BOOL GetComputerName(LPTSTR name, LPDWORD len) { - int host = gethostname(name, HOST_NAME_MAX); - if(host == 0) - { - return TRUE; - } - return FALSE; + int host = gethostname(name, HOST_NAME_MAX); + if(host == 0) + { + return TRUE; + } + return FALSE; } diff --git a/src/tests/test-getcomputername.cpp b/src/tests/test-getcomputername.cpp index f4ce811fc4..8b0f19f5d7 100644 --- a/src/tests/test-getcomputername.cpp +++ b/src/tests/test-getcomputername.cpp @@ -4,25 +4,24 @@ TEST(GetComputerName,simple) { char hostname[HOST_NAME_MAX]; - TCHAR hostnameFunctionTest[HOST_NAME_MAX]; + std::string hostnameFunctionTest; DWORD hostSize = HOST_NAME_MAX; - - BOOL getComputerName = GetComputerName(hostnameFunctionTest, &hostSize); + BOOL getComputerName = GetComputerName(&hostnameFunctionTest[0], &hostSize); BOOL host = gethostname(hostname, sizeof hostname); if(host == 0) { - host = TRUE; + host = TRUE; } else { - host = FALSE; + host = FALSE; } - std::string hostnameSting(hostname); - std::string hostnameStingTest(hostnameFunctionTest); + std::string hostnameString(hostname); + std::string hostnameStringTest(&hostnameFunctionTest[0]); ASSERT_TRUE(getComputerName == TRUE); ASSERT_EQ(host,TRUE); - ASSERT_EQ(hostnameSting,hostnameFunctionTest); + ASSERT_EQ(hostnameString,hostnameStringTest); } \ No newline at end of file