upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 15:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify prefs::get_system_username

Browse Source
This commit is contained in:
Charles Dang 2024-09-08 15:14:00 -04:00
parent 4991005765
commit dfd9429e0d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/preferences/preferences.cpp
View File

@ -46,7 +46,6 @@
#ifdef _WIN32
#include "serialization/unicode_cast.hpp"
#include <boost/range/iterator_range.hpp>
#include <windows.h>
#endif
@ -1871,21 +1870,20 @@ void prefs::clear_mp_alert_prefs()
std::string prefs::get_system_username()
{
std::string res;
#ifdef _WIN32
wchar_t buffer[300];
DWORD size = 300;
if(GetUserNameW(buffer, &size)) {
//size includes a terminating null character.
assert(size > 0);
res = unicode_cast<std::string>(boost::iterator_range<wchar_t*>(buffer, buffer + size - 1));
return unicode_cast<std::string>(std::wstring_view{buffer});
}
#else
if(char* const login = getenv("USER")) {
res = login;
return login;
}
#endif
return res;
return {};
}
preferences::secure_buffer prefs::build_key(const std::string& server, const std::string& login)