clang-format: copy latest and re-format
clang-format-16 has some backwards incompatible changes that require
additional settings for best compatibility and re-running the formatter.
Copy the latest .clang-format from the docs repository and reformat the
repository.
Change-Id: I61b093f75011417cc9c7acf9605200f4fa429bac
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/oem/ibm/libpldmresponder/file_io.hpp b/oem/ibm/libpldmresponder/file_io.hpp
index ddde7f8..4e2af4f 100644
--- a/oem/ibm/libpldmresponder/file_io.hpp
+++ b/oem/ibm/libpldmresponder/file_io.hpp
@@ -178,59 +178,52 @@
{
handlers.emplace(PLDM_READ_FILE_INTO_MEMORY,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->readFileIntoMemory(request,
- payloadLength);
- });
+ return this->readFileIntoMemory(request, payloadLength);
+ });
handlers.emplace(PLDM_WRITE_FILE_FROM_MEMORY,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->writeFileFromMemory(request,
- payloadLength);
- });
+ return this->writeFileFromMemory(request, payloadLength);
+ });
handlers.emplace(PLDM_WRITE_FILE_BY_TYPE_FROM_MEMORY,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->writeFileByTypeFromMemory(
- request, payloadLength);
- });
+ return this->writeFileByTypeFromMemory(request, payloadLength);
+ });
handlers.emplace(PLDM_READ_FILE_BY_TYPE_INTO_MEMORY,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->readFileByTypeIntoMemory(
- request, payloadLength);
- });
- handlers.emplace(PLDM_READ_FILE_BY_TYPE, [this](const pldm_msg* request,
- size_t payloadLength) {
+ return this->readFileByTypeIntoMemory(request, payloadLength);
+ });
+ handlers.emplace(PLDM_READ_FILE_BY_TYPE,
+ [this](const pldm_msg* request, size_t payloadLength) {
return this->readFileByType(request, payloadLength);
});
handlers.emplace(PLDM_WRITE_FILE_BY_TYPE,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->writeFileByType(request,
- payloadLength);
- });
+ return this->writeFileByType(request, payloadLength);
+ });
handlers.emplace(PLDM_GET_FILE_TABLE,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->getFileTable(request, payloadLength);
- });
+ return this->getFileTable(request, payloadLength);
+ });
handlers.emplace(PLDM_READ_FILE,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->readFile(request, payloadLength);
- });
+ return this->readFile(request, payloadLength);
+ });
handlers.emplace(PLDM_WRITE_FILE,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->writeFile(request, payloadLength);
- });
+ return this->writeFile(request, payloadLength);
+ });
handlers.emplace(PLDM_FILE_ACK,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->fileAck(request, payloadLength);
- });
+ return this->fileAck(request, payloadLength);
+ });
handlers.emplace(PLDM_HOST_GET_ALERT_STATUS,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->getAlertStatus(request,
- payloadLength);
- });
+ return this->getAlertStatus(request, payloadLength);
+ });
handlers.emplace(PLDM_NEW_FILE_AVAILABLE,
[this](const pldm_msg* request, size_t payloadLength) {
- return this->newFileAvailable(request,
- payloadLength);
- });
+ return this->newFileAvailable(request, payloadLength);
+ });
resDumpMatcher = std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
@@ -238,42 +231,39 @@
sdbusplus::bus::match::rules::argNpath(0, dumpObjPath),
[this, hostSockFd, hostEid, dbusImplReqester,
handler](sdbusplus::message_t& msg) {
- std::map<
- std::string,
- std::map<std::string, std::variant<std::string, uint32_t>>>
- interfaces;
- sdbusplus::message::object_path path;
- msg.read(path, interfaces);
- std::string vspstring;
- std::string password;
+ std::map<std::string,
+ std::map<std::string, std::variant<std::string, uint32_t>>>
+ interfaces;
+ sdbusplus::message::object_path path;
+ msg.read(path, interfaces);
+ std::string vspstring;
+ std::string password;
- for (auto& interface : interfaces)
+ for (auto& interface : interfaces)
+ {
+ if (interface.first == resDumpEntry)
{
- if (interface.first == resDumpEntry)
+ for (const auto& property : interface.second)
{
- for (const auto& property : interface.second)
+ if (property.first == "VSPString")
{
- if (property.first == "VSPString")
- {
- vspstring =
- std::get<std::string>(property.second);
- }
- else if (property.first == "Password")
- {
- password =
- std::get<std::string>(property.second);
- }
+ vspstring = std::get<std::string>(property.second);
}
- dbusToFileHandlers
- .emplace_back(
- std::make_unique<pldm::requester::oem_ibm::
- DbusToFileHandler>(
- hostSockFd, hostEid, dbusImplReqester, path,
- handler))
- ->processNewResourceDump(vspstring, password);
- break;
+ else if (property.first == "Password")
+ {
+ password = std::get<std::string>(property.second);
+ }
}
+ dbusToFileHandlers
+ .emplace_back(
+ std::make_unique<
+ pldm::requester::oem_ibm::DbusToFileHandler>(
+ hostSockFd, hostEid, dbusImplReqester, path,
+ handler))
+ ->processNewResourceDump(vspstring, password);
+ break;
}
+ }
});
vmiCertMatcher = std::make_unique<sdbusplus::bus::match_t>(
pldm::utils::DBusHandler::getBus(),
@@ -281,40 +271,39 @@
sdbusplus::bus::match::rules::argNpath(0, certObjPath),
[this, hostSockFd, hostEid, dbusImplReqester,
handler](sdbusplus::message_t& msg) {
- std::map<
- std::string,
- std::map<std::string, std::variant<std::string, uint32_t>>>
- interfaces;
- sdbusplus::message::object_path path;
- msg.read(path, interfaces);
- std::string csr;
+ std::map<std::string,
+ std::map<std::string, std::variant<std::string, uint32_t>>>
+ interfaces;
+ sdbusplus::message::object_path path;
+ msg.read(path, interfaces);
+ std::string csr;
- for (auto& interface : interfaces)
+ for (auto& interface : interfaces)
+ {
+ if (interface.first == certAuthority)
{
- if (interface.first == certAuthority)
+ for (const auto& property : interface.second)
{
- for (const auto& property : interface.second)
+ if (property.first == "CSR")
{
- if (property.first == "CSR")
- {
- csr = std::get<std::string>(property.second);
- auto fileHandle =
- sdbusplus::message::object_path(path)
- .filename();
+ csr = std::get<std::string>(property.second);
+ auto fileHandle =
+ sdbusplus::message::object_path(path)
+ .filename();
- dbusToFileHandlers
- .emplace_back(std::make_unique<
- pldm::requester::oem_ibm::
- DbusToFileHandler>(
+ dbusToFileHandlers
+ .emplace_back(
+ std::make_unique<pldm::requester::oem_ibm::
+ DbusToFileHandler>(
hostSockFd, hostEid, dbusImplReqester,
path, handler))
- ->newCsrFileAvailable(csr, fileHandle);
- break;
- }
+ ->newCsrFileAvailable(csr, fileHandle);
+ break;
}
- break;
}
+ break;
}
+ }
});
}
@@ -426,11 +415,11 @@
std::unique_ptr<pldm::requester::oem_ibm::DbusToFileHandler>
dbusToFileHandler; //!< pointer to send request to Host
std::unique_ptr<sdbusplus::bus::match_t>
- resDumpMatcher; //!< Pointer to capture the interface added signal
- //!< for new resource dump
+ resDumpMatcher; //!< Pointer to capture the interface added signal
+ //!< for new resource dump
std::unique_ptr<sdbusplus::bus::match_t>
- vmiCertMatcher; //!< Pointer to capture the interface added signal
- //!< for new csr string
+ vmiCertMatcher; //!< Pointer to capture the interface added signal
+ //!< for new csr string
/** @brief PLDM request handler */
pldm::requester::Handler<pldm::requester::Request>* handler;
std::vector<std::unique_ptr<pldm::requester::oem_ibm::DbusToFileHandler>>