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.
This commit is contained in:
Andrew Schwartzmeyer 2015-07-22 16:04:11 -07:00
parent e2d4ce0ab1
commit bb8d0b793e
2 changed files with 5 additions and 5 deletions

View file

@ -43,8 +43,8 @@ BOOL GetUserName(WCHAR_T *lpBuffer, LPDWORD lpnSize)
} }
// Get username from system in a thread-safe manner // Get username from system in a thread-safe manner
char userName[L_cuserid]; char userName[LOGIN_NAME_MAX];
int err = getlogin_r(userName, L_cuserid); int err = getlogin_r(userName, LOGIN_NAME_MAX);
// Map errno to Win32 Error Codes // Map errno to Win32 Error Codes
if (err != 0) { if (err != 0) {
switch (errno) { switch (errno) {

View file

@ -114,8 +114,8 @@ TEST_F(GetUserNameTest, BufferSizeAsUserNamePlusOne) {
TestSuccess(); TestSuccess();
} }
TEST_F(GetUserNameTest, L_cuseridSize) { TEST_F(GetUserNameTest, BufferSizeAsLoginNameMax) {
// L_cuserid is big enough to hold any username // LoginNameMax is big enough to hold any username
TestWithSize(L_cuserid); TestWithSize(LOGIN_NAME_MAX);
TestSuccess(); TestSuccess();
} }