commit 6beabf3f44c032c677aea9c216909908d179c723
author Bob Beck <bbe@google.com> Tue Nov 21 09:43:52 2023 -0700
committer Boringssl LUCI CQ <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 21 20:46:34 2023 +0000
tree 6f19915f814f274db67bf2d90b74046c28486e27
parent 5c7a2a007c2553354514a9e719245295dcebd34f

Use InsertBraces - and reformat pki as such

Bug: 659
Change-Id: I48eeda0bcd0de45d70644c321138225f83cb6c60
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64107
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
Auto-Submit: Bob Beck <bbe@google.com>

pki/cert_errors.cc

diff --git a/pki/cert_errors.cc b/pki/cert_errors.cc
index 80f28d0..da95b49 100644
--- a/pki/cert_errors.cc
+++ b/pki/cert_errors.cc
@@ -52,8 +52,9 @@
   result += CertErrorIdToDebugString(id);
   result += +"\n";
 
-  if (params)
+  if (params) {
     AppendLinesWithIndentation(params->ToDebugString(), "  ", &result);
+  }
 
   return result;
 }
@@ -84,16 +85,18 @@
 
 std::string CertErrors::ToDebugString() const {
   std::string result;
-  for (const CertError &node : nodes_)
+  for (const CertError &node : nodes_) {
     result += node.ToDebugString();
+  }
 
   return result;
 }
 
 bool CertErrors::ContainsError(CertErrorId id) const {
   for (const CertError &node : nodes_) {
-    if (node.id == id)
+    if (node.id == id) {
       return true;
+    }
   }
   return false;
 }
@@ -101,8 +104,9 @@
 bool CertErrors::ContainsAnyErrorWithSeverity(
     CertError::Severity severity) const {
   for (const CertError &node : nodes_) {
-    if (node.severity == severity)
+    if (node.severity == severity) {
       return true;
+    }
   }
   return false;
 }
@@ -115,14 +119,16 @@
 CertPathErrors::~CertPathErrors() = default;
 
 CertErrors *CertPathErrors::GetErrorsForCert(size_t cert_index) {
-  if (cert_index >= cert_errors_.size())
+  if (cert_index >= cert_errors_.size()) {
     cert_errors_.resize(cert_index + 1);
+  }
   return &cert_errors_[cert_index];
 }
 
 const CertErrors *CertPathErrors::GetErrorsForCert(size_t cert_index) const {
-  if (cert_index >= cert_errors_.size())
+  if (cert_index >= cert_errors_.size()) {
     return nullptr;
+  }
   return &cert_errors_[cert_index];
 }
 
@@ -130,12 +136,14 @@
 
 bool CertPathErrors::ContainsError(CertErrorId id) const {
   for (const CertErrors &errors : cert_errors_) {
-    if (errors.ContainsError(id))
+    if (errors.ContainsError(id)) {
       return true;
+    }
   }
 
-  if (other_errors_.ContainsError(id))
+  if (other_errors_.ContainsError(id)) {
     return true;
+  }
 
   return false;
 }
@@ -143,12 +151,14 @@
 bool CertPathErrors::ContainsAnyErrorWithSeverity(
     CertError::Severity severity) const {
   for (const CertErrors &errors : cert_errors_) {
-    if (errors.ContainsAnyErrorWithSeverity(severity))
+    if (errors.ContainsAnyErrorWithSeverity(severity)) {
       return true;
+    }
   }
 
-  if (other_errors_.ContainsAnyErrorWithSeverity(severity))
+  if (other_errors_.ContainsAnyErrorWithSeverity(severity)) {
     return true;
+  }
 
   return false;
 }
@@ -162,8 +172,9 @@
     // then continue.
     const CertErrors &errors = cert_errors_[i];
     std::string cert_errors_string = errors.ToDebugString();
-    if (cert_errors_string.empty())
+    if (cert_errors_string.empty()) {
       continue;
+    }
 
     // Add a header that identifies which certificate this CertErrors pertains
     // to.