From ec267c348a046f25bdf5d1313f07b4fa852640df Mon Sep 17 00:00:00 2001 From: Gliniak Date: Thu, 13 Jun 2024 20:56:56 +0200 Subject: [PATCH] [LINT] Fixed lint issues after clang-format update --- src/xenia/apu/xma_context.h | 8 ++++---- src/xenia/base/testing/threading_test.cc | 9 +++------ src/xenia/cpu/backend/backend.h | 2 +- src/xenia/kernel/util/xex2_info.h | 2 +- src/xenia/kernel/util/xuserdata.h | 2 +- src/xenia/kernel/xboxkrnl/xboxkrnl_error.cc | 3 +-- src/xenia/kernel/xboxkrnl/xboxkrnl_rtl.cc | 6 ++---- src/xenia/kernel/xthread.cc | 4 ++-- src/xenia/patcher/patch_db.h | 4 ++-- src/xenia/ui/imgui_notification.h | 2 +- src/xenia/ui/windowed_app_main_win.cc | 3 +-- src/xenia/vfs/devices/disc_zarchive_device.cc | 2 +- src/xenia/vfs/devices/xcontent_container_device.h | 2 +- 13 files changed, 21 insertions(+), 28 deletions(-) diff --git a/src/xenia/apu/xma_context.h b/src/xenia/apu/xma_context.h index 7093f5f45..c08d36753 100644 --- a/src/xenia/apu/xma_context.h +++ b/src/xenia/apu/xma_context.h @@ -183,11 +183,11 @@ class XmaContext { }; virtual bool Work() { return false; }; - virtual void Enable(){}; + virtual void Enable() {}; virtual bool Block(bool poll) { return 0; }; - virtual void Clear(){}; - virtual void Disable(){}; - virtual void Release(){}; + virtual void Clear() {}; + virtual void Disable() {}; + virtual void Release() {}; Memory* memory() const { return memory_; } diff --git a/src/xenia/base/testing/threading_test.cc b/src/xenia/base/testing/threading_test.cc index f19af2647..8c0a73b3c 100644 --- a/src/xenia/base/testing/threading_test.cc +++ b/src/xenia/base/testing/threading_test.cc @@ -975,8 +975,7 @@ TEST_CASE("Create and Run Thread", "[thread]") { thread = Thread::Create(params, [] { Thread::Exit(-1); FAIL("Function must not return"); - while (true) - ; + while (true); }); result = Wait(thread.get(), false, 1s); REQUIRE(result == WaitResult::kSuccess); @@ -992,8 +991,7 @@ TEST_CASE("Create and Run Thread", "[thread]") { thread = Thread::Create(params, [] { Thread::Exit(-1); FAIL("Function must not return"); - while (true) - ; + while (true); }); REQUIRE(thread != nullptr); result = Wait(thread.get(), false, 1s); @@ -1128,8 +1126,7 @@ TEST_CASE("Test Thread QueueUserCallback", "[thread]") { order++; // 2 AlertableSleep(1s); FAIL("Thread should have been terminated during alertable sleep"); - while (true) - ; + while (true); }); REQUIRE(!spin_wait_for(100ms, [&] { return order == 3; })); // timeout thread->QueueUserCallback([] { Thread::Exit(0); }); diff --git a/src/xenia/cpu/backend/backend.h b/src/xenia/cpu/backend/backend.h index 0cc4d4b50..80dea76e8 100644 --- a/src/xenia/cpu/backend/backend.h +++ b/src/xenia/cpu/backend/backend.h @@ -82,7 +82,7 @@ class Backend { uses */ virtual void DeinitializeBackendContext(void* ctx) {} - virtual void SetGuestRoundingMode(void* ctx, unsigned int mode){}; + virtual void SetGuestRoundingMode(void* ctx, unsigned int mode) {}; /* called by KeSetCurrentStackPointers in xboxkrnl_threading.cc just prior to calling XThread::Reenter this is an opportunity for a backend to clear any diff --git a/src/xenia/kernel/util/xex2_info.h b/src/xenia/kernel/util/xex2_info.h index c2ab401af..9b649b7c9 100644 --- a/src/xenia/kernel/util/xex2_info.h +++ b/src/xenia/kernel/util/xex2_info.h @@ -394,7 +394,7 @@ struct xex2_opt_bound_path { struct xex2_opt_checksum_timedatestamp { xe::be checksum; // 0x0 sz:0x4 xe::be timedatestamp; // 0x4 sz:0x4 -}; // size 8 +}; // size 8 static_assert_size(xex2_opt_checksum_timedatestamp, 0x8); struct xex2_opt_static_library { diff --git a/src/xenia/kernel/util/xuserdata.h b/src/xenia/kernel/util/xuserdata.h index 794882b6d..348f06847 100644 --- a/src/xenia/kernel/util/xuserdata.h +++ b/src/xenia/kernel/util/xuserdata.h @@ -74,7 +74,7 @@ class UserData { }; }; - UserData(){}; + UserData() {}; UserData(X_USER_DATA_TYPE type) { data_.type = type; } virtual void Append(X_USER_DATA* data, DataByteStream* stream) { diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_error.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_error.cc index c3c9ddb11..fb9061170 100644 --- a/src/xenia/kernel/xboxkrnl/xboxkrnl_error.cc +++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_error.cc @@ -960,8 +960,7 @@ const uint32_t error_table_0xC0980001[] = { 0x00000037, // 0xC0980008 }; -#define MAKE_ENTRY(x) \ - { x, xe::countof(error_table_##x), error_table_##x } +#define MAKE_ENTRY(x) {x, xe::countof(error_table_##x), error_table_##x} const error_lookup_table error_tables[] = { MAKE_ENTRY(0x00000103), MAKE_ENTRY(0x40000002), MAKE_ENTRY(0x40020056), MAKE_ENTRY(0x400200AF), MAKE_ENTRY(0x80000001), MAKE_ENTRY(0x80000288), diff --git a/src/xenia/kernel/xboxkrnl/xboxkrnl_rtl.cc b/src/xenia/kernel/xboxkrnl/xboxkrnl_rtl.cc index 746769b62..f34cec4f6 100644 --- a/src/xenia/kernel/xboxkrnl/xboxkrnl_rtl.cc +++ b/src/xenia/kernel/xboxkrnl/xboxkrnl_rtl.cc @@ -151,15 +151,13 @@ static int RtlCompareStringN_impl(uint8_t* string_1, unsigned int string_1_len, int case_insensitive) { if (string_1_len == 0xFFFFFFFF) { uint8_t* string1_strlen_iter = string_1; - while (*string1_strlen_iter++) - ; + while (*string1_strlen_iter++); string_1_len = static_cast(string1_strlen_iter - string_1 - 1); } if (string_2_len == 0xFFFFFFFF) { uint8_t* string2_strlen_iter = string_2; - while (*string2_strlen_iter++) - ; + while (*string2_strlen_iter++); string_2_len = static_cast(string2_strlen_iter - string_2 - 1); } diff --git a/src/xenia/kernel/xthread.cc b/src/xenia/kernel/xthread.cc index ea62eb362..9879e4126 100644 --- a/src/xenia/kernel/xthread.cc +++ b/src/xenia/kernel/xthread.cc @@ -520,8 +520,8 @@ X_STATUS XThread::Terminate(int exit_code) { class reenter_exception { public: - reenter_exception(uint32_t address) : address_(address){}; - virtual ~reenter_exception(){}; + reenter_exception(uint32_t address) : address_(address) {}; + virtual ~reenter_exception() {}; uint32_t address() const { return address_; } private: diff --git a/src/xenia/patcher/patch_db.h b/src/xenia/patcher/patch_db.h index f707c9281..ab3cf03a3 100644 --- a/src/xenia/patcher/patch_db.h +++ b/src/xenia/patcher/patch_db.h @@ -51,7 +51,7 @@ struct PatchDataEntry { const PatchDataValue data; PatchDataEntry(const uint32_t memory_address, const PatchDataValue patch_data) - : address(memory_address), data(patch_data){}; + : address(memory_address), data(patch_data) {}; }; struct PatchInfoEntry { @@ -86,7 +86,7 @@ struct PatchData { uint8_t size; PatchDataType type; - PatchData(uint8_t size_, PatchDataType type_) : size(size_), type(type_){}; + PatchData(uint8_t size_, PatchDataType type_) : size(size_), type(type_) {}; }; class PatchDB { diff --git a/src/xenia/ui/imgui_notification.h b/src/xenia/ui/imgui_notification.h index c8e900646..f412f032c 100644 --- a/src/xenia/ui/imgui_notification.h +++ b/src/xenia/ui/imgui_notification.h @@ -130,7 +130,7 @@ class AchievementNotificationWindow final : ImGuiNotification { std::string title, std::string description, uint8_t user_index, uint8_t position_id = 0) : ImGuiNotification(imgui_drawer, title, description, user_index, - position_id){}; + position_id) {}; void OnDraw(ImGuiIO& io) override; }; diff --git a/src/xenia/ui/windowed_app_main_win.cc b/src/xenia/ui/windowed_app_main_win.cc index 3f25da10a..53aa802d0 100644 --- a/src/xenia/ui/windowed_app_main_win.cc +++ b/src/xenia/ui/windowed_app_main_win.cc @@ -202,8 +202,7 @@ const char* HostExceptionReport::GetFormattedAddress(uintptr_t address) { size_t search_back = strlen(tmp_module_name); // hunt backwards for the last sep - while (tmp_module_name[--search_back] != '\\') - ; + while (tmp_module_name[--search_back] != '\\'); // MessageBoxA(nullptr, tmp_module_name, "ffds", MB_OK); sprintf_s(current_buffer, "%s+%llX", tmp_module_name + search_back + 1, diff --git a/src/xenia/vfs/devices/disc_zarchive_device.cc b/src/xenia/vfs/devices/disc_zarchive_device.cc index 477a4deef..0f81e4bdd 100644 --- a/src/xenia/vfs/devices/disc_zarchive_device.cc +++ b/src/xenia/vfs/devices/disc_zarchive_device.cc @@ -23,7 +23,7 @@ DiscZarchiveDevice::DiscZarchiveDevice(const std::string_view mount_path, const std::filesystem::path& host_path) : Device(mount_path), name_("GDFX"), host_path_(host_path), reader_() {} -DiscZarchiveDevice::~DiscZarchiveDevice(){}; +DiscZarchiveDevice::~DiscZarchiveDevice() {}; bool DiscZarchiveDevice::Initialize() { reader_ = diff --git a/src/xenia/vfs/devices/xcontent_container_device.h b/src/xenia/vfs/devices/xcontent_container_device.h index 5395f844b..2623ac3ed 100644 --- a/src/xenia/vfs/devices/xcontent_container_device.h +++ b/src/xenia/vfs/devices/xcontent_container_device.h @@ -80,7 +80,7 @@ class XContentContainerDevice : public Device { // multiple file. virtual Result LoadHostFiles(FILE* header_file) = 0; // Initialize any container specific fields. - virtual void SetupContainer(){}; + virtual void SetupContainer() {}; Entry* ResolvePath(const std::string_view path); void CloseFiles();