From 9426e9c4551493db768620e9d08185eae85a1df3 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Wed, 22 Jul 2015 16:04:11 -0700 Subject: [PATCH] Use LOGIN_NAME_MAX instead of L_cuserid Since L_cuserid is only for cuserid, not getlogin_r Unit test for L_cuserid removed because the macro may not be available on all platforms. --- impl/getusername.cpp | 4 ++-- tests/test-getusername.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/impl/getusername.cpp b/impl/getusername.cpp index 203ed5e7e..d369a4a3d 100644 --- a/impl/getusername.cpp +++ b/impl/getusername.cpp @@ -43,8 +43,8 @@ BOOL GetUserName(WCHAR_T *lpBuffer, LPDWORD lpnSize) } // Get username from system in a thread-safe manner - char userName[L_cuserid]; - int err = getlogin_r(userName, L_cuserid); + char userName[LOGIN_NAME_MAX]; + int err = getlogin_r(userName, LOGIN_NAME_MAX); // Map errno to Win32 Error Codes if (err != 0) { switch (errno) { diff --git a/tests/test-getusername.cpp b/tests/test-getusername.cpp index b58387b26..8e025a2de 100644 --- a/tests/test-getusername.cpp +++ b/tests/test-getusername.cpp @@ -114,8 +114,8 @@ TEST_F(GetUserNameTest, BufferSizeAsUserNamePlusOne) { TestSuccess(); } -TEST_F(GetUserNameTest, L_cuseridSize) { - // L_cuserid is big enough to hold any username - TestWithSize(L_cuserid); +TEST_F(GetUserNameTest, BufferSizeAsLoginNameMax) { + // LoginNameMax is big enough to hold any username + TestWithSize(LOGIN_NAME_MAX); TestSuccess(); }