clang-format: re-format for clang-18
clang-format-18 isn't compatible with the clang-format-17 output, so we
need to reformat the code with the latest version. The way clang-18
handles lambda formatting also changed, so we have made changes to the
organization default style format to better handle lambda formatting.
See I5e08687e696dd240402a2780158664b7113def0e for updated style.
See Iea0776aaa7edd483fa395e23de25ebf5a6288f71 for clang-18 enablement.
Change-Id: I2b9626d95674508bb090745de6471fe2755c89fd
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/image_verify.cpp b/image_verify.cpp
index 12e938e..687fff7 100644
--- a/image_verify.cpp
+++ b/image_verify.cpp
@@ -38,8 +38,7 @@
Signature::Signature(const fs::path& imageDirPath,
const fs::path& signedConfPath) :
- imageDirPath(imageDirPath),
- signedConfPath(signedConfPath)
+ imageDirPath(imageDirPath), signedConfPath(signedConfPath)
{
fs::path file(imageDirPath / MANIFEST_FILE_NAME);
@@ -200,8 +199,8 @@
sigFile += SIGNATURE_FILE_EXT;
// Verify the signature.
- optionalImagesValid = verifyFile(file, sigFile, publicKeyFile,
- hashType);
+ optionalImagesValid =
+ verifyFile(file, sigFile, publicKeyFile, hashType);
if (!optionalImagesValid)
{
error("Image file Signature Validation failed on {IMAGE}",
@@ -410,10 +409,9 @@
size);
}
-bool Signature::checkAndVerifyImage(const std::string& filePath,
- const std::string& publicKeyPath,
- const std::vector<std::string>& imageList,
- bool& fileFound)
+bool Signature::checkAndVerifyImage(
+ const std::string& filePath, const std::string& publicKeyPath,
+ const std::vector<std::string>& imageList, bool& fileFound)
{
bool valid = true;