3 files changed, 21 insertions, 18 deletions

diff --git a/src/core/hle/service/acc/acc.h b/src/core/hle/service/acc/acc.h
index a94e6f588..d7c6d2415 100644
--- a/src/core/hle/service/acc/acc.h
+++ b/src/core/hle/service/acc/acc.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
+#include "core/hle/service/acc/profile_manager.h"
 #include "core/hle/service/service.h"
-#include "profile_manager.h"
 
 namespace Service::Account {
 
diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp
index fda796966..14d65ff1b 100644
--- a/src/core/hle/service/acc/profile_manager.cpp
+++ b/src/core/hle/service/acc/profile_manager.cpp
@@ -2,8 +2,8 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
+#include "core/hle/service/acc/profile_manager.h"
 #include "core/settings.h"
-#include "profile_manager.h"
 
 namespace Service::Account {
 // TODO(ogniK): Get actual error codes
@@ -28,10 +28,9 @@ size_t ProfileManager::AddToProfiles(const ProfileInfo& user) {
 bool ProfileManager::RemoveProfileAtIdx(size_t index) {
     if (index >= MAX_USERS || index >= user_count)
         return false;
-    profiles[index] = ProfileInfo{};
     if (index < user_count - 1)
-        for (size_t i = index; i < user_count - 1; i++)
-            profiles[i] = profiles[i + 1]; // Shift upper profiles down
+        std::rotate(profiles.begin() + index, profiles.begin() + index + 1, profiles.end());
+    profiles.back() = {};
     user_count--;
     return true;
 }
@@ -50,9 +49,10 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& userna
         return ERROR_ARGUMENT_IS_NULL;
     if (username[0] == 0x0)
         return ERROR_ARGUMENT_IS_NULL;
-    for (unsigned i = 0; i < user_count; i++)
-        if (uuid == profiles[i].user_uuid)
-            return ERROR_USER_ALREADY_EXISTS;
+    if (std::any_of(profiles.begin(), profiles.end(),
+                    [&uuid](const ProfileInfo& profile) { return uuid == profile.user_uuid; })) {
+        return ERROR_USER_ALREADY_EXISTS;
+    }
     ProfileInfo prof_inf;
     prof_inf.user_uuid = std::move(uuid);
     prof_inf.username = std::move(username);
@@ -62,7 +62,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array<u8, 0x20>& userna
     return AddUser(prof_inf);
 }
 
-ResultCode ProfileManager::CreateNewUser(UUID uuid, std::string username) {
+ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username) {
     std::array<u8, 0x20> username_output;
     if (username.size() > username_output.size())
         std::copy_n(username.begin(), username_output.size(), username_output.begin());
@@ -74,10 +74,13 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, std::string username) {
 size_t ProfileManager::GetUserIndex(const UUID& uuid) const {
     if (!uuid)
         return std::numeric_limits<size_t>::max();
-    for (unsigned i = 0; i < user_count; i++)
-        if (profiles[i].user_uuid == uuid)
-            return i;
-    return std::numeric_limits<size_t>::max();
+
+    auto iter = std::find_if(profiles.begin(), profiles.end(),
+                             [&uuid](const ProfileInfo& p) { return p.user_uuid == uuid; });
+    if (iter == profiles.end()) {
+        return std::numeric_limits<size_t>::max();
+    }
+    return static_cast<size_t>(std::distance(profiles.begin(), iter));
 }
 
 size_t ProfileManager::GetUserIndex(ProfileInfo user) const {
diff --git a/src/core/hle/service/acc/profile_manager.h b/src/core/hle/service/acc/profile_manager.h
index ad4c20db0..121206954 100644
--- a/src/core/hle/service/acc/profile_manager.h
+++ b/src/core/hle/service/acc/profile_manager.h
@@ -12,10 +12,11 @@
 namespace Service::Account {
 constexpr size_t MAX_USERS = 8;
 constexpr size_t MAX_DATA = 128;
+static const u128 INVALID_UUID = {0, 0};
 
 struct UUID {
     // UUIDs which are 0 are considered invalid!
-    u128 uuid{0, 0};
+    u128 uuid = INVALID_UUID;
     UUID() = default;
     explicit UUID(const u128& id) : uuid{id} {}
     explicit UUID(const u64 lo, const u64 hi) {
@@ -23,7 +24,7 @@ struct UUID {
         uuid[1] = hi;
     };
     explicit operator bool() const {
-        return uuid[0] != 0x0 || uuid[1] != 0x0;
+        return uuid[0] != INVALID_UUID[0] && uuid[1] != INVALID_UUID[1];
     }
 
     bool operator==(const UUID& rhs) const {
@@ -41,8 +42,7 @@ struct UUID {
         return *this;
     }
     void Invalidate() {
-        uuid[0] = 0;
-        uuid[1] = 0;
+        uuid = INVALID_UUID;
     }
     std::string Format() const {
         return fmt::format("0x{:016X}{:016X}", uuid[1], uuid[0]);
@@ -81,7 +81,7 @@ public:
     ProfileManager(); // TODO(ogniK): Load from system save
     ResultCode AddUser(ProfileInfo user);
     ResultCode CreateNewUser(UUID uuid, std::array<u8, 0x20>& username);
-    ResultCode CreateNewUser(UUID uuid, std::string username);
+    ResultCode CreateNewUser(UUID uuid, const std::string& username);
     size_t GetUserIndex(const UUID& uuid) const;
     size_t GetUserIndex(ProfileInfo user) const;
     bool GetProfileBase(size_t index, ProfileBase& profile) const;