commit a41f014cbec2e48be2ca9debaf48b97dcc87b210
author Patrick Williams <patrick@stwcx.xyz> Wed Dec 18 11:22:53 2024 -0500
committer Patrick Williams <patrick@stwcx.xyz> Wed Dec 18 11:22:54 2024 -0500
tree 2fcdb7ce0222cd1f36c51c40c950479848dc624c
parent 2e98156a5032aba4c195225f79b79a47920eba03

clang-format: re-format for clang-19

clang-format-19 isn't compatible with the clang-format-18 output, so we
need to reformat the code with the latest version.  A few parameters
in clang-tidy have been deprecated, so adjust the style file
accordingly.

See Ie2f6eb3b043f2d655c9df806815afd7971fd0947 for updated style.
See I88192b41ab7a95599a90915013579608af7bc56f for clang-19 enablement.

Change-Id: I01fcad7867561151b7543e86204d9e875205f9fb
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

.clang-format

diff --git a/.clang-format b/.clang-format
index 28e3328..a75a2c2 100644
--- a/.clang-format
+++ b/.clang-format
@@ -17,9 +17,7 @@
 AllowShortIfStatementsOnASingleLine: Never
 AllowShortLambdasOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterReturnType: None
 AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: true
 BinPackParameters: true
 BitFieldColonSpacing: None
@@ -43,12 +41,14 @@
   SplitEmptyRecord:     false
   SplitEmptyNamespace:  false
 BreakAfterAttributes: Never
+BreakAfterReturnType: Automatic
 BreakBeforeBinaryOperators: None
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
 BreakInheritanceList: AfterColon
 BreakStringLiterals: false
+BreakTemplateDeclarations: Yes
 ColumnLimit:     80
 CommentPragmas:  '^ IWYU pragma:'
 CompactNamespaces: false

src/fru_device.cpp

diff --git a/src/fru_device.cpp b/src/fru_device.cpp
index f2452f5..403f6eb 100644
--- a/src/fru_device.cpp
+++ b/src/fru_device.cpp
@@ -247,8 +247,7 @@
 
     constexpr size_t smbusWriteThenReadMsgCount = 2;
     std::array<struct i2c_msg, smbusWriteThenReadMsgCount> msgs{};
-    struct i2c_rdwr_ioctl_data rdwr
-    {};
+    struct i2c_rdwr_ioctl_data rdwr{};
 
     msgs[0].addr = address;
     msgs[0].flags = 0;
@@ -1151,8 +1150,7 @@
         return false;
     }
 
-    struct FruArea fruAreaParams
-    {};
+    struct FruArea fruAreaParams{};
 
     if (!findFruAreaLocationAndField(fruData, propertyName, fruAreaParams))
     {

src/perform_scan.cpp

diff --git a/src/perform_scan.cpp b/src/perform_scan.cpp
index 91372e4..f866b32 100644
--- a/src/perform_scan.cpp
+++ b/src/perform_scan.cpp
@@ -46,10 +46,10 @@
     std::string interface;
 };
 
-void getInterfaces(
-    const DBusInterfaceInstance& instance,
-    const std::vector<std::shared_ptr<PerformProbe>>& probeVector,
-    const std::shared_ptr<PerformScan>& scan, size_t retries = 5)
+void
+    getInterfaces(const DBusInterfaceInstance& instance,
+                  const std::vector<std::shared_ptr<PerformProbe>>& probeVector,
+                  const std::shared_ptr<PerformScan>& scan, size_t retries = 5)
 {
     if (retries == 0U)
     {