Просмотр исходного кода

[-] chore(quality): satisfy the repository clang-format config

The contributing rules require the provided clang-format and clang-tidy
configs, and seven files this branch touches did not satisfy the
former. Every violation was a line carried past the 100 column limit or
an include left out of order; clang-format 22.1.3 reflows them.

The reflow is whitespace only. The largest two are argument lists moving
to a hanging indent because the call head no longer fit, and the two
include blocks are reordered within their own group.

All 945 tracked sources were checked. Outside vendor, which is third
party and not formatted to this config, the one file still reported is
bubble_authority_replacements.cpp. It predates this branch and nothing
here touches it, so it is left alone rather than pulled into an
unrelated diff.
Thomas Shields 3 недель назад
Родитель
Сommit
24036b41ad

+ 1 - 2
Sunrise/src/middleware/web_service/messages/opcode1901_codec.cpp

@@ -37,8 +37,7 @@ constexpr std::uint64_t kSelectorStride = 4;
 } // namespace
 
 /** Compares a decoded selector against the part of an instance identity the wire carries. */
-bool identifies_instance(std::uint64_t instanceIdentityToken,
-                         std::uint64_t instanceSoid) noexcept {
+bool identifies_instance(std::uint64_t instanceIdentityToken, std::uint64_t instanceSoid) noexcept {
     return instanceIdentityToken != 0
            && (instanceSoid & kInstanceIdentityMask) == instanceIdentityToken;
 }

+ 45 - 45
Sunrise/src/server/bap/encrypted/push/snapshot/family4_inventory_updates.cpp

@@ -151,27 +151,27 @@ bool prepare_profile_item_acquisition(Scratch& scratch,
     }
 
     std::array<char, core::log::kLineCapacity> line{};
-    const int count =
-        std::snprintf(line.data(),
-                      line.size(),
-                      "ev=profile_acquire stage=account_object result=ok family_version=%d "
-                      "account=0x%llX definition=%u item_count=%zu definition_hash=0x%08X quantity=%d "
-                      "native_row=%zu mutation_serial=%d change_slot=%u change_next_sequence=%u "
-                      "change_kind=%u account_payload_bytes=%zu objects=%zu object_order=%s",
-                      acquisition.after.family4Version,
-                      static_cast<unsigned long long>(acquisition.accountSoid),
-                      acquisition.accountDefinitionId,
-                      mutation.afterItemCount,
-                      mutation.acquiredDefinitionHash,
-                      mutation.acquiredQuantity,
-                      acquiredRow,
-                      mutation.acquiredMutationSerial,
-                      static_cast<unsigned>(kAcquisitionChangeNextWriteSlot),
-                      static_cast<unsigned>(kAcquisitionChangeNextSequence),
-                      static_cast<unsigned>(kAcquisitionChangeKind),
-                      prepared.family.objects[accountObjectIndex].payload.size(),
-                      objectCount,
-                      acquisition.appendedResident ? "item-account" : "account");
+    const int count = std::snprintf(
+        line.data(),
+        line.size(),
+        "ev=profile_acquire stage=account_object result=ok family_version=%d "
+        "account=0x%llX definition=%u item_count=%zu definition_hash=0x%08X quantity=%d "
+        "native_row=%zu mutation_serial=%d change_slot=%u change_next_sequence=%u "
+        "change_kind=%u account_payload_bytes=%zu objects=%zu object_order=%s",
+        acquisition.after.family4Version,
+        static_cast<unsigned long long>(acquisition.accountSoid),
+        acquisition.accountDefinitionId,
+        mutation.afterItemCount,
+        mutation.acquiredDefinitionHash,
+        mutation.acquiredQuantity,
+        acquiredRow,
+        mutation.acquiredMutationSerial,
+        static_cast<unsigned>(kAcquisitionChangeNextWriteSlot),
+        static_cast<unsigned>(kAcquisitionChangeNextSequence),
+        static_cast<unsigned>(kAcquisitionChangeKind),
+        prepared.family.objects[accountObjectIndex].payload.size(),
+        objectCount,
+        acquisition.appendedResident ? "item-account" : "account");
     if (count > 0) {
         core::log::write(core::log::Channel::server,
                          core::log::Level::debug,
@@ -601,30 +601,30 @@ bool prepare_item_dismantle(Scratch& scratch,
     }
 
     std::array<char, core::log::kLineCapacity> line{};
-    const int count =
-        std::snprintf(line.data(),
-                      line.size(),
-                      "ev=dismantle stage=family4_objects result=ok family_version=%d root=0x%llX "
-                      "character=0x%llX character_definition=%u instance=0x%llX item_definition=%u "
-                      "definition_hash=0x%08X inventory_index=%zu inventory_row=%u equipment_slot=%u "
-                      "moved_items=%zu items_after=%zu next_serial=%u rewards=%zu objects=%zu "
-                      "order=%s",
-                      dismantle.after.family4Version,
-                      static_cast<unsigned long long>(dismantle.after.family4RootSoid),
-                      static_cast<unsigned long long>(dismantle.characterSoid),
-                      dismantle.characterDefinitionId,
-                      static_cast<unsigned long long>(dismantle.dismantledInstanceSoid),
-                      dismantle.itemInstanceDefinitionId,
-                      mutation.dismantledItem.definitionHash,
-                      mutation.inventoryIndex,
-                      static_cast<unsigned>(mutation.inventoryRow),
-                      static_cast<unsigned>(mutation.equipmentSlot),
-                      mutation.movedInventoryItemCount,
-                      mutation.afterCharacter.inventory.count,
-                      mutation.afterCharacter.nextInventorySerial,
-                      mutation.rewardCount,
-                      objectCount,
-                      dismantle.updatesAccount ? "character_release_account" : "character_release");
+    const int count = std::snprintf(
+        line.data(),
+        line.size(),
+        "ev=dismantle stage=family4_objects result=ok family_version=%d root=0x%llX "
+        "character=0x%llX character_definition=%u instance=0x%llX item_definition=%u "
+        "definition_hash=0x%08X inventory_index=%zu inventory_row=%u equipment_slot=%u "
+        "moved_items=%zu items_after=%zu next_serial=%u rewards=%zu objects=%zu "
+        "order=%s",
+        dismantle.after.family4Version,
+        static_cast<unsigned long long>(dismantle.after.family4RootSoid),
+        static_cast<unsigned long long>(dismantle.characterSoid),
+        dismantle.characterDefinitionId,
+        static_cast<unsigned long long>(dismantle.dismantledInstanceSoid),
+        dismantle.itemInstanceDefinitionId,
+        mutation.dismantledItem.definitionHash,
+        mutation.inventoryIndex,
+        static_cast<unsigned>(mutation.inventoryRow),
+        static_cast<unsigned>(mutation.equipmentSlot),
+        mutation.movedInventoryItemCount,
+        mutation.afterCharacter.inventory.count,
+        mutation.afterCharacter.nextInventorySerial,
+        mutation.rewardCount,
+        objectCount,
+        dismantle.updatesAccount ? "character_release_account" : "character_release");
     if (count > 0) {
         core::log::write(core::log::Channel::server,
                          core::log::Level::debug,

+ 6 - 10
Sunrise/src/server/web_service/web_service_actions.cpp

@@ -6,11 +6,11 @@
 #include <string_view>
 
 #include "../../core/logging/log.h"
+#include "../../middleware/web_service/messages/opcode1820.h"
+#include "../../middleware/web_service/messages/opcode1901.h"
 #include "../../middleware/web_service/messages/opcode402.h"
 #include "../../middleware/web_service/messages/opcode403.h"
 #include "../../middleware/web_service/messages/opcode406.h"
-#include "../../middleware/web_service/messages/opcode1820.h"
-#include "../../middleware/web_service/messages/opcode1901.h"
 #include "../../middleware/web_service/messages/opcode504.h"
 #include "../../middleware/web_service/messages/opcode903.h"
 #include "../../state/account/account_state.h"
@@ -232,7 +232,8 @@ void select_character(const middleware::web_service::Message& message, Outcome&
 [[nodiscard]] bool parse_equipment_instance(const middleware::web_service::Message& message,
                                             std::uint64_t& instanceSoid) noexcept {
     middleware::web_service::messages::opcode403::Request request{};
-    const bool parsed = middleware::web_service::messages::opcode403::parse_request(message, request);
+    const bool parsed =
+        middleware::web_service::messages::opcode403::parse_request(message, request);
     instanceSoid = request.instanceSoid;
     return parsed;
 }
@@ -561,13 +562,8 @@ void report_item_dismantle(const middleware::web_service::Message& message,
 void dismantle_item(const middleware::web_service::Message& message, Outcome& outcome) noexcept {
     middleware::web_service::messages::opcode402::Request request{};
     if (!middleware::web_service::messages::opcode402::parse_request(message, request)) {
-        report_item_dismantle(message,
-                              "fail",
-                              "payload_bits",
-                              request.instanceSoid,
-                              request.definitionIndex,
-                              0,
-                              0);
+        report_item_dismantle(
+            message, "fail", "payload_bits", request.instanceSoid, request.definitionIndex, 0, 0);
         return;
     }
     const std::uint64_t instanceSoid = request.instanceSoid;

+ 1 - 2
Sunrise/src/server/web_service/web_service_runtime.cpp

@@ -231,8 +231,7 @@ bool consume(std::span<const std::byte> request,
     } else {
         dispatched = false;
     }
-    const bool prepared =
-        outcome.hasSelectedCharacter || outcome.mutation.index() != kNoMutation;
+    const bool prepared = outcome.hasSelectedCharacter || outcome.mutation.index() != kNoMutation;
 
     middleware::web_service::ResponseShape shape{};
     resolve_response_shape(message.opcode, shape);

+ 2 - 3
Sunrise/src/state/build_data/items/socket_plugs/socket_plug_build_data_runtime.cpp

@@ -1,5 +1,5 @@
-#include "../../runtime.h"
 #include "../../collectibles/collectible_catalog.h"
+#include "../../runtime.h"
 #include "../../runtime/persistence/publication_transaction.h"
 #include "../details/item_detail_catalog.h"
 #include "../item_catalog.h"
@@ -87,8 +87,7 @@ bool is_consumed_on_apply(std::uint16_t itemDefinitionIndex, std::uint8_t bucket
 bool is_profile_action_source(std::uint16_t itemDefinitionIndex, std::uint8_t bucketId) noexcept {
     items::details::Definition detail{};
     inventory::buckets::Descriptor bucket{};
-    if ((bucketId != kOrnamentBucketId && bucketId != kShaderBucketId)
-        || !socket_plug_rules_ready()
+    if ((bucketId != kOrnamentBucketId && bucketId != kShaderBucketId) || !socket_plug_rules_ready()
         || !find_configured_item_detail(itemDefinitionIndex, detail)
         || detail.definitionIndex != itemDefinitionIndex || detail.bucketId != bucketId
         || !find_inventory_bucket_descriptor(bucketId, bucket)

+ 1 - 2
Sunrise/src/state/build_data/runtime/persistence/build_data_persistence.cpp

@@ -185,8 +185,7 @@ cache::records::MutableDomains scratch_domains(Context& state) noexcept {
  * Releases one transient cache snapshot bank without walking its capacity.
  * @param storage Bank emptied and handed back to the allocator.
  */
-template <typename Value>
-void release_bank(std::vector<Value>& storage) noexcept {
+template <typename Value> void release_bank(std::vector<Value>& storage) noexcept {
     storage.clear();
     storage.shrink_to_fit();
 }

+ 22 - 22
Sunrise/src/state/runtime/state_account_runtime.cpp

@@ -125,28 +125,28 @@ void report_profile_acquisition(std::string_view stage,
                                 std::int32_t acquiredQuantity,
                                 bool appended) noexcept {
     std::array<char, core::log::kLineCapacity> line{};
-    const int count =
-        std::snprintf(line.data(),
-                      line.size(),
-                      "ev=profile_acquire stage=%.*s result=%.*s reason=%.*s definition_hash=0x%08X "
-                      "account=0x%llX instance=0x%llX bucket=%u profile_index=%zu item_count=%zu "
-                      "quantity_before=%d "
-                      "quantity_after=%d appended=%u",
-                      static_cast<int>(stage.size()),
-                      stage.data(),
-                      static_cast<int>(result.size()),
-                      result.data(),
-                      static_cast<int>(reason.size()),
-                      reason.data(),
-                      definitionHash,
-                      static_cast<unsigned long long>(accountSoid),
-                      static_cast<unsigned long long>(instanceSoid),
-                      static_cast<unsigned>(bucketId),
-                      profileIndex,
-                      itemCount,
-                      previousQuantity,
-                      acquiredQuantity,
-                      static_cast<unsigned>(appended));
+    const int count = std::snprintf(
+        line.data(),
+        line.size(),
+        "ev=profile_acquire stage=%.*s result=%.*s reason=%.*s definition_hash=0x%08X "
+        "account=0x%llX instance=0x%llX bucket=%u profile_index=%zu item_count=%zu "
+        "quantity_before=%d "
+        "quantity_after=%d appended=%u",
+        static_cast<int>(stage.size()),
+        stage.data(),
+        static_cast<int>(result.size()),
+        result.data(),
+        static_cast<int>(reason.size()),
+        reason.data(),
+        definitionHash,
+        static_cast<unsigned long long>(accountSoid),
+        static_cast<unsigned long long>(instanceSoid),
+        static_cast<unsigned>(bucketId),
+        profileIndex,
+        itemCount,
+        previousQuantity,
+        acquiredQuantity,
+        static_cast<unsigned>(appended));
     if (count > 0) {
         core::log::write(core::log::Channel::state,
                          result == "ok" ? core::log::Level::debug : core::log::Level::warn,