*** 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, 61 insertions, 71 deletions

diff --git a/lldb/source/lldb.cpp b/lldb/source/lldb.cpp
index 1e02d2a..2c1fa6a 100644
--- a/lldb/source/lldb.cpp
+++ b/lldb/source/lldb.cpp
@@ -12,96 +12,86 @@
 using namespace lldb;
 using namespace lldb_private;
 
-#if defined (__APPLE__)
+#if defined(__APPLE__)
 extern "C" const unsigned char liblldb_coreVersionString[];
 #else
 
 #include "clang/Basic/Version.h"
 
-static const char *
-GetLLDBRevision()
-{
+static const char *GetLLDBRevision() {
 #ifdef LLDB_REVISION
-    return LLDB_REVISION;
+  return LLDB_REVISION;
 #else
-    return NULL;
+  return NULL;
 #endif
 }
 
-static const char *
-GetLLDBRepository()
-{
+static const char *GetLLDBRepository() {
 #ifdef LLDB_REPOSITORY
-    return LLDB_REPOSITORY;
+  return LLDB_REPOSITORY;
 #else
-    return NULL;
+  return NULL;
 #endif
 }
 
 #endif
 
-const char *
-lldb_private::GetVersion ()
-{
-#if defined (__APPLE__)
-    static char g_version_string[32];
-    if (g_version_string[0] == '\0')
-    {
-        const char *version_string = ::strstr ((const char *)liblldb_coreVersionString, "PROJECT:");
-        
-        if (version_string)
-            version_string += sizeof("PROJECT:") - 1;
-        else
-            version_string = "unknown";
-        
-        const char *newline_loc = strchr(version_string, '\n');
-        
-        size_t version_len = sizeof(g_version_string) - 1;
-        
-        if (newline_loc &&
-            (newline_loc - version_string < static_cast<ptrdiff_t>(version_len)))
-            version_len = newline_loc - version_string;
-        
-        ::snprintf(g_version_string, version_len + 1, "%s", version_string);
-    }
+const char *lldb_private::GetVersion() {
+#if defined(__APPLE__)
+  static char g_version_string[32];
+  if (g_version_string[0] == '\0') {
+    const char *version_string =
+        ::strstr((const char *)liblldb_coreVersionString, "PROJECT:");
+
+    if (version_string)
+      version_string += sizeof("PROJECT:") - 1;
+    else
+      version_string = "unknown";
+
+    const char *newline_loc = strchr(version_string, '\n');
+
+    size_t version_len = sizeof(g_version_string) - 1;
+
+    if (newline_loc &&
+        (newline_loc - version_string < static_cast<ptrdiff_t>(version_len)))
+      version_len = newline_loc - version_string;
+
+    ::snprintf(g_version_string, version_len + 1, "%s", version_string);
+  }
 
-    return g_version_string;
+  return g_version_string;
 #else
-    // On platforms other than Darwin, report a version number in the same style as the clang tool.
-    static std::string g_version_str;
-    if (g_version_str.empty())
-    {
-        g_version_str += "lldb version ";
-        g_version_str += CLANG_VERSION_STRING;
-        const char * lldb_repo = GetLLDBRepository();
-        if (lldb_repo)
-        {
-            g_version_str += " (";
-            g_version_str += lldb_repo;
-        }
-
-        const char *lldb_rev = GetLLDBRevision();
-        if (lldb_rev)
-        {
-            g_version_str += " revision ";
-            g_version_str += lldb_rev;
-        }
-        std::string clang_rev (clang::getClangRevision());
-        if (clang_rev.length() > 0)
-        {
-            g_version_str += " clang revision ";
-            g_version_str += clang_rev;
-        }
-        std::string llvm_rev (clang::getLLVMRevision());
-        if (llvm_rev.length() > 0)
-        {
-            g_version_str += " llvm revision ";
-            g_version_str += llvm_rev;
-        }
-
-        if (lldb_repo)
-            g_version_str += ")";
+  // On platforms other than Darwin, report a version number in the same style
+  // as the clang tool.
+  static std::string g_version_str;
+  if (g_version_str.empty()) {
+    g_version_str += "lldb version ";
+    g_version_str += CLANG_VERSION_STRING;
+    const char *lldb_repo = GetLLDBRepository();
+    if (lldb_repo) {
+      g_version_str += " (";
+      g_version_str += lldb_repo;
     }
-    return g_version_str.c_str();
+
+    const char *lldb_rev = GetLLDBRevision();
+    if (lldb_rev) {
+      g_version_str += " revision ";
+      g_version_str += lldb_rev;
+    }
+    std::string clang_rev(clang::getClangRevision());
+    if (clang_rev.length() > 0) {
+      g_version_str += " clang revision ";
+      g_version_str += clang_rev;
+    }
+    std::string llvm_rev(clang::getLLVMRevision());
+    if (llvm_rev.length() > 0) {
+      g_version_str += " llvm revision ";
+      g_version_str += llvm_rev;
+    }
+
+    if (lldb_repo)
+      g_version_str += ")";
+  }
+  return g_version_str.c_str();
 #endif
 }