*** 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, 75 insertions, 87 deletions

diff --git a/lldb/tools/debugserver/source/DNBError.cpp b/lldb/tools/debugserver/source/DNBError.cpp
index c9d8ebd..cd04358 100644
--- a/lldb/tools/debugserver/source/DNBError.cpp
+++ b/lldb/tools/debugserver/source/DNBError.cpp
@@ -20,109 +20,97 @@
 #include <SpringBoardServices/SpringBoardServer.h>
 #endif
 
-const char *
-DNBError::AsString() const
-{
-    if (Success())
-        return NULL;
+const char *DNBError::AsString() const {
+  if (Success())
+    return NULL;
 
-    if (m_str.empty())
-    {
-        const char *s = NULL;
-        switch (m_flavor)
-        {
-        case MachKernel:
-            s = ::mach_error_string (m_err);
-            break;
+  if (m_str.empty()) {
+    const char *s = NULL;
+    switch (m_flavor) {
+    case MachKernel:
+      s = ::mach_error_string(m_err);
+      break;
 
-        case POSIX:
-            s = ::strerror (m_err);
-            break;
+    case POSIX:
+      s = ::strerror(m_err);
+      break;
 
 #ifdef WITH_SPRINGBOARD
-        case SpringBoard:
-            {
-                CFStringRef statusStr = SBSApplicationLaunchingErrorString (m_err);
-                if (CFString::UTF8 (statusStr, m_str) == NULL)
-                    m_str.clear();
-            }
-            break;
+    case SpringBoard: {
+      CFStringRef statusStr = SBSApplicationLaunchingErrorString(m_err);
+      if (CFString::UTF8(statusStr, m_str) == NULL)
+        m_str.clear();
+    } break;
 #endif
 #ifdef WITH_BKS
-        case BackBoard:
-            {
-                // You have to call ObjC routines to get the error string from BackBoardServices.
-                // Not sure I want to make DNBError.cpp an .mm file.  For now just make sure you
-                // pre-populate the error string when you make the DNBError of type BackBoard.
-                m_str.assign("Should have set BackBoard error when making the error string.");
-            }
-            break;
+    case BackBoard: {
+      // You have to call ObjC routines to get the error string from
+      // BackBoardServices.
+      // Not sure I want to make DNBError.cpp an .mm file.  For now just make
+      // sure you
+      // pre-populate the error string when you make the DNBError of type
+      // BackBoard.
+      m_str.assign(
+          "Should have set BackBoard error when making the error string.");
+    } break;
 #endif
 #ifdef WITH_FBS
-        case FrontBoard:
-            {
-                // You have to call ObjC routines to get the error string from FrontBoardServices.
-                // Not sure I want to make DNBError.cpp an .mm file.  For now just make sure you
-                // pre-populate the error string when you make the DNBError of type FrontBoard.
-                m_str.assign("Should have set FrontBoard error when making the error string.");
-            }
-            break;
+    case FrontBoard: {
+      // You have to call ObjC routines to get the error string from
+      // FrontBoardServices.
+      // Not sure I want to make DNBError.cpp an .mm file.  For now just make
+      // sure you
+      // pre-populate the error string when you make the DNBError of type
+      // FrontBoard.
+      m_str.assign(
+          "Should have set FrontBoard error when making the error string.");
+    } break;
 #endif
-        default:
-            break;
-        }
-        if (s)
-            m_str.assign(s);
+    default:
+      break;
     }
-    if (m_str.empty())
-        return NULL;
-    return m_str.c_str();
+    if (s)
+      m_str.assign(s);
+  }
+  if (m_str.empty())
+    return NULL;
+  return m_str.c_str();
 }
 
-void
-DNBError::LogThreadedIfError(const char *format, ...) const
-{
-    if (Fail())
-    {
-        char *arg_msg = NULL;
-        va_list args;
-        va_start (args, format);
-        ::vasprintf (&arg_msg, format, args);
-        va_end (args);
+void DNBError::LogThreadedIfError(const char *format, ...) const {
+  if (Fail()) {
+    char *arg_msg = NULL;
+    va_list args;
+    va_start(args, format);
+    ::vasprintf(&arg_msg, format, args);
+    va_end(args);
 
-        if (arg_msg != NULL)
-        {
-            const char *err_str = AsString();
-            if (err_str == NULL)
-                err_str = "???";
-            DNBLogThreaded ("error: %s err = %s (0x%8.8x)", arg_msg, err_str, m_err);
-            free (arg_msg);
-        }
+    if (arg_msg != NULL) {
+      const char *err_str = AsString();
+      if (err_str == NULL)
+        err_str = "???";
+      DNBLogThreaded("error: %s err = %s (0x%8.8x)", arg_msg, err_str, m_err);
+      free(arg_msg);
     }
+  }
 }
 
-void
-DNBError::LogThreaded(const char *format, ...) const
-{
-    char *arg_msg = NULL;
-    va_list args;
-    va_start (args, format);
-    ::vasprintf (&arg_msg, format, args);
-    va_end (args);
+void DNBError::LogThreaded(const char *format, ...) const {
+  char *arg_msg = NULL;
+  va_list args;
+  va_start(args, format);
+  ::vasprintf(&arg_msg, format, args);
+  va_end(args);
 
-    if (arg_msg != NULL)
-    {
-        if (Fail())
-        {
-            const char *err_str = AsString();
-            if (err_str == NULL)
-                err_str = "???";
-            DNBLogThreaded ("error: %s err = %s (0x%8.8x)", arg_msg, err_str, m_err);
-        }
-        else
-        {
-            DNBLogThreaded ("%s err = 0x%8.8x", arg_msg, m_err);
-        }
-        free (arg_msg);
+  if (arg_msg != NULL) {
+    if (Fail()) {
+      const char *err_str = AsString();
+      if (err_str == NULL)
+        err_str = "???";
+      DNBLogThreaded("error: %s err = %s (0x%8.8x)", arg_msg, err_str, m_err);
+    } else {
+      DNBLogThreaded("%s err = 0x%8.8x", arg_msg, m_err);
     }
+    free(arg_msg);
+  }
 }