yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

If statement style change

This commit is contained in:
David Marcec 2018-08-11 18:46:42 +10:00
parent dfea525cbe
commit acff922762
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core/hle/service/acc/profile_manager.cpp
View File

@ -26,10 +26,12 @@ size_t ProfileManager::AddToProfiles(const ProfileInfo& user) {
} }
bool ProfileManager::RemoveProfileAtIdx(size_t index) { bool ProfileManager::RemoveProfileAtIdx(size_t index) {
if (index >= MAX_USERS || index >= user_count) if (index >= MAX_USERS || index >= user_count) {
return false; return false;
if (index < user_count - 1) }
if (index < user_count - 1) {
std::rotate(profiles.begin() + index, profiles.begin() + index + 1, profiles.end()); std::rotate(profiles.begin() + index, profiles.begin() + index + 1, profiles.end());
}
profiles.back() = {}; profiles.back() = {};
user_count--; user_count--;
return true; return true;
@ -43,12 +45,15 @@ ResultCode ProfileManager::AddUser(ProfileInfo user) {
} }
ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& username) { ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& username) {
if (user_count == MAX_USERS) if (user_count == MAX_USERS) {
return ERROR_TOO_MANY_USERS; return ERROR_TOO_MANY_USERS;
if (!uuid) }
if (!uuid) {
return ERROR_ARGUMENT_IS_NULL; return ERROR_ARGUMENT_IS_NULL;
if (username[0] == 0x0) }
if (username[0] == 0x0) {
return ERROR_ARGUMENT_IS_NULL; return ERROR_ARGUMENT_IS_NULL;
}
if (std::any_of(profiles.begin(), profiles.end(), if (std::any_of(profiles.begin(), profiles.end(),
[&uuid](const ProfileInfo& profile) { return uuid == profile.user_uuid; })) { [&uuid](const ProfileInfo& profile) { return uuid == profile.user_uuid; })) {
return ERROR_USER_ALREADY_EXISTS; return ERROR_USER_ALREADY_EXISTS;
@ -64,17 +69,18 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& userna
ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username) { ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username) {
std::array<u8, 0x20> username_output; std::array<u8, 0x20> username_output;
if (username.size() > username_output.size()) if (username.size() > username_output.size()) {
std::copy_n(username.begin(), username_output.size(), username_output.begin()); std::copy_n(username.begin(), username_output.size(), username_output.begin());
else } else {
std::copy(username.begin(), username.end(), username_output.begin()); std::copy(username.begin(), username.end(), username_output.begin());
}
return CreateNewUser(uuid, username_output); return CreateNewUser(uuid, username_output);
} }
size_t ProfileManager::GetUserIndex(const UUID& uuid) const { size_t ProfileManager::GetUserIndex(const UUID& uuid) const {
if (!uuid) if (!uuid) {
return std::numeric_limits<size_t>::max(); return std::numeric_limits<size_t>::max();
}
auto iter = std::find_if(profiles.begin(), profiles.end(), auto iter = std::find_if(profiles.begin(), profiles.end(),
[&uuid](const ProfileInfo& p) { return p.user_uuid == uuid; }); [&uuid](const ProfileInfo& p) { return p.user_uuid == uuid; });
if (iter == profiles.end()) { if (iter == profiles.end()) {
@ -118,16 +124,18 @@ bool ProfileManager::UserExists(UUID uuid) const {
void ProfileManager::OpenUser(UUID uuid) { void ProfileManager::OpenUser(UUID uuid) {
auto idx = GetUserIndex(uuid); auto idx = GetUserIndex(uuid);
if (idx == std::numeric_limits<size_t>::max()) if (idx == std::numeric_limits<size_t>::max()) {
return; return;
}
profiles[idx].is_open = true; profiles[idx].is_open = true;
last_opened_user = uuid; last_opened_user = uuid;
} }
void ProfileManager::CloseUser(UUID uuid) { void ProfileManager::CloseUser(UUID uuid) {
auto idx = GetUserIndex(uuid); auto idx = GetUserIndex(uuid);
if (idx == std::numeric_limits<size_t>::max()) if (idx == std::numeric_limits<size_t>::max()) {
return; return;
}
profiles[idx].is_open = false; profiles[idx].is_open = false;
} }