clang-format: update latest spec and reformat

Copy the latest format file from the docs repository and apply.

Change-Id: Iac96affe709a51dd865117d006cb033cf5c624b1
Signed-off-by: Patrick Williams <[email protected]>

Author: williamspatrick

.clang-format

@@ -104,7 +104,7 @@ PenaltyBreakFirstLessLess: 120
 PenaltyBreakString: 1000
 PenaltyBreakTemplateDeclaration: 10
 PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
+PenaltyReturnTypeOnItsOwnLine: 150
 PenaltyIndentedWhitespace: 1
 PointerAlignment: Left
 QualifierAlignment: Left

extensions/openpower-pels/data_interface.cpp

@@ -465,8 +465,8 @@ void DataInterface::getHWCalloutFields(
     serialNumber = std::string{value.begin(), value.end()};
 }
 
-std::string
-    DataInterface::getLocationCode(const std::string& inventoryPath) const
+std::string DataInterface::getLocationCode(
+    const std::string& inventoryPath) const
 {
     auto service = getService(inventoryPath, interface::locCode);
 
@@ -477,8 +477,8 @@ std::string
     return std::get<std::string>(locCode);
 }
 
-std::string
-    DataInterface::addLocationCodePrefix(const std::string& locationCode)
+std::string DataInterface::addLocationCodePrefix(
+    const std::string& locationCode)
 {
     static const std::string locationCodePrefix{"Ufcs-"};
 
@@ -820,8 +820,8 @@ std::vector<uint8_t> DataInterface::getRawProgressSRC(void) const
     return std::get<1>(rawProgress);
 }
 
-std::optional<std::vector<uint8_t>>
-    DataInterface::getDIProperty(const std::string& locationCode) const
+std::optional<std::vector<uint8_t>> DataInterface::getDIProperty(
+    const std::string& locationCode) const
 {
     std::vector<uint8_t> viniDI;
 
@@ -850,8 +850,8 @@ std::optional<std::vector<uint8_t>>
     return viniDI;
 }
 
-std::optional<bool>
-    DataInterfaceBase::isDIMMLocCode(const std::string& locCode) const
+std::optional<bool> DataInterfaceBase::isDIMMLocCode(
+    const std::string& locCode) const
 {
     if (_locationCache.contains(locCode))
     {

extensions/openpower-pels/data_interface.hpp

@@ -355,8 +355,8 @@ class DataInterfaceBase
      *
      * @return std::string - The location code
      */
-    virtual std::string
-        getLocationCode(const std::string& inventoryPath) const = 0;
+    virtual std::string getLocationCode(
+        const std::string& inventoryPath) const = 0;
 
     /**
      * @brief Get the list of system type names the system is called.
@@ -398,9 +398,9 @@ class DataInterfaceBase
      *
      * @return std::vector<std::string> - The inventory D-Bus objects
      */
-    virtual std::vector<std::string>
-        getInventoryFromLocCode(const std::string& LocationCode, uint16_t node,
-                                bool expanded) const = 0;
+    virtual std::vector<std::string> getInventoryFromLocCode(
+        const std::string& LocationCode, uint16_t node,
+        bool expanded) const = 0;
 
     /**
      * @brief Sets the Asserted property on the LED group passed in.
@@ -426,8 +426,8 @@ class DataInterfaceBase
      *
      * @param[in] objectPath - The D-Bus object path
      */
-    virtual void
-        setCriticalAssociation(const std::string& objectPath) const = 0;
+    virtual void setCriticalAssociation(
+        const std::string& objectPath) const = 0;
 
     /**
      * @brief Returns the manufacturing QuiesceOnError property
@@ -450,8 +450,8 @@ class DataInterfaceBase
      * @param[in] locationCode - location code to split
      * @return pair<string, string> - The base and connector segments
      */
-    static std::pair<std::string, std::string>
-        extractConnectorFromLocCode(const std::string& locationCode);
+    static std::pair<std::string, std::string> extractConnectorFromLocCode(
+        const std::string& locationCode);
 
 #ifdef PEL_ENABLE_PHAL
     /**
@@ -472,9 +472,9 @@ class DataInterfaceBase
      * @param[in] priSRC - Primary SRC value (e.g. BD8D1001)
      * @param[in] srcStruct - Full SRC base structure
      */
-    virtual void
-        createProgressSRC(const uint64_t& priSRC,
-                          const std::vector<uint8_t>& srcStruct) const = 0;
+    virtual void createProgressSRC(
+        const uint64_t& priSRC,
+        const std::vector<uint8_t>& srcStruct) const = 0;
 
     /**
      * @brief Get the list of unresolved OpenBMC event log ids that have an
@@ -501,8 +501,8 @@ class DataInterfaceBase
      * @return std::optional<std::vector<uint8_t>> -  The FRUs DI or
      * std::nullopt
      */
-    virtual std::optional<std::vector<uint8_t>>
-        getDIProperty(const std::string& locationCode) const = 0;
+    virtual std::optional<std::vector<uint8_t>> getDIProperty(
+        const std::string& locationCode) const = 0;
 
     /**
      * @brief Wrpper API to call pHAL API 'getFRUType()' and check whether the
@@ -788,8 +788,8 @@ class DataInterface : public DataInterfaceBase
      *
      * @return std::string - The location code
      */
-    std::string
-        getLocationCode(const std::string& inventoryPath) const override;
+    std::string getLocationCode(
+        const std::string& inventoryPath) const override;
 
     /**
      * @brief Get the list of system type names the system is called.
@@ -831,9 +831,9 @@ class DataInterface : public DataInterfaceBase
      *
      * @return std::vector<std::string> - The inventory D-Bus objects
      */
-    std::vector<std::string>
-        getInventoryFromLocCode(const std::string& locationCode, uint16_t node,
-                                bool expanded) const override;
+    std::vector<std::string> getInventoryFromLocCode(
+        const std::string& locationCode, uint16_t node,
+        bool expanded) const override;
 
     /**
      * @brief Sets the Asserted property on the LED group passed in.
@@ -886,9 +886,9 @@ class DataInterface : public DataInterfaceBase
      * @param[in] priSRC - Primary SRC value
      * @param[in] srcStruct - Full SRC base structure
      */
-    void
-        createProgressSRC(const uint64_t& priSRC,
-                          const std::vector<uint8_t>& srcStruct) const override;
+    void createProgressSRC(
+        const uint64_t& priSRC,
+        const std::vector<uint8_t>& srcStruct) const override;
 
     /**
      * @brief Get the list of unresolved OpenBMC event log ids that have an
@@ -915,8 +915,8 @@ class DataInterface : public DataInterfaceBase
      * @return std::optional<std::vector<uint8_t>> -  The FRUs DI or
      * std::nullopt
      */
-    std::optional<std::vector<uint8_t>>
-        getDIProperty(const std::string& locationCode) const override;
+    std::optional<std::vector<uint8_t>> getDIProperty(
+        const std::string& locationCode) const override;
 
     /**
      * @brief Finds all D-Bus Associated paths that contain any of the

extensions/openpower-pels/device_callouts.cpp

@@ -156,8 +156,8 @@ std::string getFSISearchKeys(const std::string& devPath)
     return links;
 }
 
-std::tuple<std::string, std::tuple<size_t, uint8_t>>
-    getFSII2CSearchKeys(const std::string& devPath)
+std::tuple<std::string, std::tuple<size_t, uint8_t>> getFSII2CSearchKeys(
+    const std::string& devPath)
 {
     // This combines the FSI and i2C search keys
 
@@ -327,8 +327,8 @@ std::vector<device_callouts::Callout> calloutI2CUsingPath(
  *
  * @return std::vector<Callout> - The callouts
  */
-std::vector<device_callouts::Callout>
-    calloutFSI(const std::string& devPath, const nlohmann::json& calloutJSON)
+std::vector<device_callouts::Callout> calloutFSI(
+    const std::string& devPath, const nlohmann::json& calloutJSON)
 {
     auto links = getFSISearchKeys(devPath);
 
@@ -359,8 +359,8 @@ std::vector<device_callouts::Callout>
  *
  * @return std::vector<Callout> - The callouts
  */
-std::vector<device_callouts::Callout>
-    calloutFSII2C(const std::string& devPath, const nlohmann::json& calloutJSON)
+std::vector<device_callouts::Callout> calloutFSII2C(
+    const std::string& devPath, const nlohmann::json& calloutJSON)
 {
     auto linksAndI2C = getFSII2CSearchKeys(devPath);
     auto links = std::get<std::string>(linksAndI2C);
@@ -405,8 +405,8 @@ std::vector<device_callouts::Callout>
  *
  * @return std::vector<Callout> - The callouts
  */
-std::vector<device_callouts::Callout>
-    calloutFSISPI(const std::string& devPath, const nlohmann::json& calloutJSON)
+std::vector<device_callouts::Callout> calloutFSISPI(
+    const std::string& devPath, const nlohmann::json& calloutJSON)
 {
     auto linksAndSPI = getFSISPISearchKeys(devPath);
     auto links = std::get<std::string>(linksAndSPI);
@@ -445,8 +445,8 @@ std::vector<device_callouts::Callout>
  *
  * @return std::vector<Callout> - The list of callouts
  */
-std::vector<device_callouts::Callout>
-    findCallouts(const std::string& devPath, const nlohmann::json& json)
+std::vector<device_callouts::Callout> findCallouts(const std::string& devPath,
+                                                   const nlohmann::json& json)
 {
     std::vector<Callout> callouts;
     fs::path path;
@@ -523,9 +523,9 @@ std::vector<Callout> getCallouts(const std::string& devPath,
     return util::findCallouts(devPath, json);
 }
 
-std::vector<Callout>
-    getI2CCallouts(size_t i2cBus, uint8_t i2cAddress,
-                   const std::vector<std::string>& compatibleList)
+std::vector<Callout> getI2CCallouts(
+    size_t i2cBus, uint8_t i2cAddress,
+    const std::vector<std::string>& compatibleList)
 {
     auto json = util::loadJSON(compatibleList);
     return util::calloutI2C(i2cBus, i2cAddress, json);

extensions/openpower-pels/device_callouts.hpp

@@ -113,9 +113,9 @@ std::vector<Callout> getCallouts(
  *                             system.
  * @return std::vector<Callout> - The list of callouts
  */
-std::vector<Callout>
-    getI2CCallouts(size_t i2cBus, uint8_t i2cAddress,
-                   const std::vector<std::string>& compatibleList);
+std::vector<Callout> getI2CCallouts(
+    size_t i2cBus, uint8_t i2cAddress,
+    const std::vector<std::string>& compatibleList);
 
 namespace util
 {
@@ -140,8 +140,8 @@ enum class CalloutType
  *
  * @return path - The path to the file.
  */
-std::filesystem::path
-    getJSONFilename(const std::vector<std::string>& compatibleList);
+std::filesystem::path getJSONFilename(
+    const std::vector<std::string>& compatibleList);
 
 /**
  * @brief Looks up the callouts in the JSON using the I2C keys.
@@ -201,8 +201,8 @@ std::string getFSISearchKeys(const std::string& devPath);
  * @return std::tuple<std::string, std::tuple<size_t, uint8_t>>
  *         - The FSI links key along with the I2C bus/address.
  */
-std::tuple<std::string, std::tuple<size_t, uint8_t>>
-    getFSII2CSearchKeys(const std::string& devPath);
+std::tuple<std::string, std::tuple<size_t, uint8_t>> getFSII2CSearchKeys(
+    const std::string& devPath);
 
 /**
  * @brief Pulls the fields out of the SPI device path to use as search keys

extensions/openpower-pels/extended_user_data.hpp

@@ -144,9 +144,9 @@ class ExtendedUserData : public Section
      * @return The JSON as a string if a parser was found,
      *         otherwise std::nullopt.
      */
-    std::optional<std::string>
-        getJSON(uint8_t creatorID,
-                const std::vector<std::string>& plugins) const override;
+    std::optional<std::string> getJSON(
+        uint8_t creatorID,
+        const std::vector<std::string>& plugins) const override;
 
     /**
      * @brief Shrink the section

extensions/openpower-pels/journal.cpp

@@ -68,8 +68,8 @@ void Journal::sync() const
     }
 }
 
-std::vector<std::string>
-    Journal::getMessages(const std::string& syslogID, size_t maxMessages) const
+std::vector<std::string> Journal::getMessages(const std::string& syslogID,
+                                              size_t maxMessages) const
 {
     // The message registry JSON schema will also fail if a zero is in the JSON
     if (0 == maxMessages)

extensions/openpower-pels/journal.hpp

@@ -30,8 +30,8 @@ class JournalBase
      *
      * @return The messages
      */
-    virtual std::vector<std::string>
-        getMessages(const std::string& syslogID, size_t maxMessages) const = 0;
+    virtual std::vector<std::string> getMessages(const std::string& syslogID,
+                                                 size_t maxMessages) const = 0;
 
     /**
      * @brief Call journalctl --sync to write unwritten journal data to disk

extensions/openpower-pels/json_utils.cpp

@@ -252,8 +252,8 @@ std::string trimEnd(std::string s)
  * @param[in] creatorID - The creator ID for the PEL
  * @return optional<string> - The comp name, or std::nullopt
  */
-static std::optional<std::string>
-    lookupComponentName(uint16_t compID, char creatorID)
+static std::optional<std::string> lookupComponentName(uint16_t compID,
+                                                      char creatorID)
 {
     static std::map<char, nlohmann::json> jsonCache;
     nlohmann::json jsonData;

extensions/openpower-pels/manager.cpp

@@ -1004,8 +1004,8 @@ uint32_t Manager::getBMCLogIdFromPELId(uint32_t pelId)
     }
 }
 
-void
-    Manager::updateProgressSRC(std::unique_ptr<openpower::pels::PEL>& pel) const
+void Manager::updateProgressSRC(
+    std::unique_ptr<openpower::pels::PEL>& pel) const
 {
     // Check for pel severity of type - 0x51 = critical error, system
     // termination

extensions/openpower-pels/pel.cpp

@@ -987,8 +987,8 @@ std::vector<uint8_t> readFD(int fd)
     return data;
 }
 
-std::unique_ptr<UserData>
-    makeFFDCuserDataSection(uint16_t componentID, const PelFFDCfile& file)
+std::unique_ptr<UserData> makeFFDCuserDataSection(uint16_t componentID,
+                                                  const PelFFDCfile& file)
 {
     auto data = readFD(file.fd);
 

extensions/openpower-pels/pel.hpp

@@ -508,8 +508,8 @@ std::vector<uint8_t> readFD(int fd);
  * @param[in] componentID - The component ID of the PEL creator
  * @param[in] file - The FFDC file information
  */
-std::unique_ptr<UserData>
-    makeFFDCuserDataSection(uint16_t componentID, const PelFFDCfile& file);
+std::unique_ptr<UserData> makeFFDCuserDataSection(uint16_t componentID,
+                                                  const PelFFDCfile& file);
 
 /**
  * @brief To create JSON object with the given location code and the hex

extensions/openpower-pels/registry.cpp

@@ -247,8 +247,8 @@ std::optional<std::map<SRC::WordNum, SRC::AdditionalDataField>>
 
     return std::nullopt;
 }
-std::optional<std::vector<SRC::WordNum>>
-    getSRCSymptomIDFields(const nlohmann::json& src, const std::string& name)
+std::optional<std::vector<SRC::WordNum>> getSRCSymptomIDFields(
+    const nlohmann::json& src, const std::string& name)
 {
     std::vector<SRC::WordNum> symptomIDFields;
 
@@ -858,8 +858,8 @@ std::optional<Entry> Registry::lookup(const std::string& name, LookupType type,
     return std::nullopt;
 }
 
-std::optional<nlohmann::json>
-    Registry::readRegistry(const std::filesystem::path& registryFile)
+std::optional<nlohmann::json> Registry::readRegistry(
+    const std::filesystem::path& registryFile)
 {
     // Look in /etc first in case someone put a test file there
     fs::path debugFile{fs::path{debugFilePath} / registryFileName};
@@ -889,10 +889,10 @@ std::optional<nlohmann::json>
     return registry;
 }
 
-std::vector<RegistryCallout>
-    Registry::getCallouts(const nlohmann::json& calloutJSON,
-                          const std::vector<std::string>& systemNames,
-                          const AdditionalData& additionalData)
+std::vector<RegistryCallout> Registry::getCallouts(
+    const nlohmann::json& calloutJSON,
+    const std::vector<std::string>& systemNames,
+    const AdditionalData& additionalData)
 {
     // The JSON may either use an AdditionalData key
     // as an index, or not.