1 files changed, 39 insertions, 34 deletions

diff --git a/lldb/tools/lldb-mi/MIUtilSingletonHelper.h b/lldb/tools/lldb-mi/MIUtilSingletonHelper.h
index 2b9f4c41665..82bed558a7d 100644
--- a/lldb/tools/lldb-mi/MIUtilSingletonHelper.h
+++ b/lldb/tools/lldb-mi/MIUtilSingletonHelper.h
@@ -9,69 +9,74 @@
 
 #pragma once
 
-namespace MI
-{
+namespace MI {
 
 // In house headers:
-#include "MIUtilString.h"
 #include "MICmnResources.h"
+#include "MIUtilString.h"
 
-//++ ============================================================================
+//++
+//============================================================================
 // Details: Short cut helper function to simplify repeated initialisation of
 //          MI components (singletons) required by a client module.
 // Type:    Template method.
-// Args:    vErrorResrcId   - (R)  The string resource ID error message identifier to place in errMsg.
-//          vwrbOk          - (RW) On input True = Try to initialize MI driver module.
-//                                 On output True = MI driver module initialise successfully.
-//          vwrErrMsg       - (W)  MI driver module initialise error description on failure.
+// Args:    vErrorResrcId   - (R)  The string resource ID error message
+// identifier to place in errMsg.
+//          vwrbOk          - (RW) On input True = Try to initialize MI driver
+//          module.
+//                                 On output True = MI driver module initialise
+//                                 successfully.
+//          vwrErrMsg       - (W)  MI driver module initialise error description
+//          on failure.
 // Return:  MIstatus::success - Functional succeeded.
 //          MIstatus::failure - Functional failed.
 //--
 template <typename T>
-bool
-ModuleInit(const MIint vErrorResrcId, bool &vwrbOk, CMIUtilString &vwrErrMsg)
-{
-    if (vwrbOk && !T::Instance().Initialize())
-    {
-        vwrbOk = MIstatus::failure;
-        vwrErrMsg = CMIUtilString::Format(MIRSRC(vErrorResrcId), T::Instance().GetErrorDescription().c_str());
-    }
+bool ModuleInit(const MIint vErrorResrcId, bool &vwrbOk,
+                CMIUtilString &vwrErrMsg) {
+  if (vwrbOk && !T::Instance().Initialize()) {
+    vwrbOk = MIstatus::failure;
+    vwrErrMsg = CMIUtilString::Format(
+        MIRSRC(vErrorResrcId), T::Instance().GetErrorDescription().c_str());
+  }
 
-    return vwrbOk;
+  return vwrbOk;
 }
 
-//++ ============================================================================
+//++
+//============================================================================
 // Details: Short cut helper function to simplify repeated shutdown of
 //          MI components (singletons) required by a client module.
 // Type:    Template method.
-// Args:    vErrorResrcId   - (R)  The string resource ID error message identifier
+// Args:    vErrorResrcId   - (R)  The string resource ID error message
+// identifier
 //                                 to place in errMsg.
 //          vwrbOk          - (W)  If not already false make false on module
 //                                 shutdown failure.
-//          vwrErrMsg       - (RW) Append to existing error description string MI
+//          vwrErrMsg       - (RW) Append to existing error description string
+//          MI
 //                                 driver module initialise error description on
 //                                 failure.
 // Return:  True - Module shutdown succeeded.
 //          False - Module shutdown failed.
 //--
 template <typename T>
-bool
-ModuleShutdown(const MIint vErrorResrcId, bool &vwrbOk, CMIUtilString &vwrErrMsg)
-{
-    bool bOk = MIstatus::success;
+bool ModuleShutdown(const MIint vErrorResrcId, bool &vwrbOk,
+                    CMIUtilString &vwrErrMsg) {
+  bool bOk = MIstatus::success;
 
-    if (!T::Instance().Shutdown())
-    {
-        const bool bMoreThanOneError(!vwrErrMsg.empty());
-        bOk = MIstatus::failure;
-        if (bMoreThanOneError)
-            vwrErrMsg += ", ";
-        vwrErrMsg += CMIUtilString::Format(MIRSRC(vErrorResrcId), T::Instance().GetErrorDescription().c_str());
-    }
+  if (!T::Instance().Shutdown()) {
+    const bool bMoreThanOneError(!vwrErrMsg.empty());
+    bOk = MIstatus::failure;
+    if (bMoreThanOneError)
+      vwrErrMsg += ", ";
+    vwrErrMsg += CMIUtilString::Format(
+        MIRSRC(vErrorResrcId), T::Instance().GetErrorDescription().c_str());
+  }
 
-    vwrbOk = bOk ? vwrbOk : MIstatus::failure;
+  vwrbOk = bOk ? vwrbOk : MIstatus::failure;
 
-    return bOk;
+  return bOk;
 }
 
 } // namespace MI