*** This commit represents a complete reformatting of the LLDB source code

*** to conform to clang-format’s LLVM style.  This kind of mass change has
*** two obvious implications:

Firstly, merging this particular commit into a downstream fork may be a huge
effort.  Alternatively, it may be worth merging all changes up to this commit,
performing the same reformatting operation locally, and then discarding the
merge for this particular commit.  The commands used to accomplish this
reformatting were as follows (with current working directory as the root of
the repository):

    find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} +
    find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ;

The version of clang-format used was 3.9.0, and autopep8 was 1.2.4.

Secondly, “blame” style tools will generally point to this commit instead of
a meaningful prior commit.  There are alternatives available that will attempt
to look through this change and find the appropriate prior commit.  YMMV.

llvm-svn: 280751

1 files changed, 45 insertions, 55 deletions

diff --git a/lldb/source/Expression/DiagnosticManager.cpp b/lldb/source/Expression/DiagnosticManager.cpp
index 5156ee3..37a9df7 100644
--- a/lldb/source/Expression/DiagnosticManager.cpp
+++ b/lldb/source/Expression/DiagnosticManager.cpp
@@ -16,76 +16,66 @@
 
 using namespace lldb_private;
 
-void
-DiagnosticManager::Dump(Log *log)
-{
-    if (!log)
-        return;
+void DiagnosticManager::Dump(Log *log) {
+  if (!log)
+    return;
 
-    std::string str = GetString();
+  std::string str = GetString();
 
-    // GetString() puts a separator after each diagnostic.
-    // We want to remove the last '\n' because log->PutCString will add one for us.
+  // GetString() puts a separator after each diagnostic.
+  // We want to remove the last '\n' because log->PutCString will add one for
+  // us.
 
-    if (str.size() && str.back() == '\n')
-    {
-        str.pop_back();
-    }
+  if (str.size() && str.back() == '\n') {
+    str.pop_back();
+  }
 
-    log->PutCString(str.c_str());
+  log->PutCString(str.c_str());
 }
 
-static const char *
-StringForSeverity(DiagnosticSeverity severity)
-{
-    switch (severity)
-    {
-        // this should be exhaustive
-        case lldb_private::eDiagnosticSeverityError:
-            return "error: ";
-        case lldb_private::eDiagnosticSeverityWarning:
-            return "warning: ";
-        case lldb_private::eDiagnosticSeverityRemark:
-            return "";
-    }
-    llvm_unreachable("switch needs another case for DiagnosticSeverity enum");
+static const char *StringForSeverity(DiagnosticSeverity severity) {
+  switch (severity) {
+  // this should be exhaustive
+  case lldb_private::eDiagnosticSeverityError:
+    return "error: ";
+  case lldb_private::eDiagnosticSeverityWarning:
+    return "warning: ";
+  case lldb_private::eDiagnosticSeverityRemark:
+    return "";
+  }
+  llvm_unreachable("switch needs another case for DiagnosticSeverity enum");
 }
 
-std::string
-DiagnosticManager::GetString(char separator)
-{
-    std::string ret;
+std::string DiagnosticManager::GetString(char separator) {
+  std::string ret;
 
-    for (const Diagnostic *diagnostic : Diagnostics())
-    {
-        ret.append(StringForSeverity(diagnostic->GetSeverity()));
-        ret.append(diagnostic->GetMessage());
-        ret.push_back(separator);
-    }
+  for (const Diagnostic *diagnostic : Diagnostics()) {
+    ret.append(StringForSeverity(diagnostic->GetSeverity()));
+    ret.append(diagnostic->GetMessage());
+    ret.push_back(separator);
+  }
 
-    return ret;
+  return ret;
 }
 
-size_t
-DiagnosticManager::Printf(DiagnosticSeverity severity, const char *format, ...)
-{
-    StreamString ss;
+size_t DiagnosticManager::Printf(DiagnosticSeverity severity,
+                                 const char *format, ...) {
+  StreamString ss;
 
-    va_list args;
-    va_start(args, format);
-    size_t result = ss.PrintfVarArg(format, args);
-    va_end(args);
+  va_list args;
+  va_start(args, format);
+  size_t result = ss.PrintfVarArg(format, args);
+  va_end(args);
 
-    AddDiagnostic(ss.GetData(), severity, eDiagnosticOriginLLDB);
+  AddDiagnostic(ss.GetData(), severity, eDiagnosticOriginLLDB);
 
-    return result;
+  return result;
 }
 
-size_t
-DiagnosticManager::PutCString(DiagnosticSeverity severity, const char *cstr)
-{
-    if (!cstr)
-        return 0;
-    AddDiagnostic(cstr, severity, eDiagnosticOriginLLDB);
-    return strlen(cstr);
+size_t DiagnosticManager::PutCString(DiagnosticSeverity severity,
+                                     const char *cstr) {
+  if (!cstr)
+    return 0;
+  AddDiagnostic(cstr, severity, eDiagnosticOriginLLDB);
+  return strlen(cstr);
 }