*** 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, 35 insertions, 40 deletions

diff --git a/lldb/tools/debugserver/source/MacOSX/OsLogger.cpp b/lldb/tools/debugserver/source/MacOSX/OsLogger.cpp
index 1f424e7..efecea3 100644
--- a/lldb/tools/debugserver/source/MacOSX/OsLogger.cpp
+++ b/lldb/tools/debugserver/source/MacOSX/OsLogger.cpp
@@ -18,54 +18,49 @@
 
 #define LLDB_OS_LOG_MAX_BUFFER_LENGTH 256
 
-namespace
-{
-    //----------------------------------------------------------------------
-    // Darwin os_log logging callback that can be registered with
-    // DNBLogSetLogCallback
-    //----------------------------------------------------------------------
-    void
-    DarwinLogCallback(void *baton, uint32_t flags, const char *format,
-                      va_list args)
-    {
-        if (format == nullptr)
-            return;
+namespace {
+//----------------------------------------------------------------------
+// Darwin os_log logging callback that can be registered with
+// DNBLogSetLogCallback
+//----------------------------------------------------------------------
+void DarwinLogCallback(void *baton, uint32_t flags, const char *format,
+                       va_list args) {
+  if (format == nullptr)
+    return;
 
-        static os_log_t g_logger;
-        if (!g_logger)
-        {
-            g_logger = os_log_create("com.apple.dt.lldb", "debugserver");
-            if (!g_logger)
-                return;
-        }
+  static os_log_t g_logger;
+  if (!g_logger) {
+    g_logger = os_log_create("com.apple.dt.lldb", "debugserver");
+    if (!g_logger)
+      return;
+  }
 
-        os_log_type_t log_type;
-        if (flags & DNBLOG_FLAG_FATAL)        log_type = OS_LOG_TYPE_FAULT;
-        else if (flags & DNBLOG_FLAG_ERROR)   log_type = OS_LOG_TYPE_ERROR;
-        else if (flags & DNBLOG_FLAG_WARNING) log_type = OS_LOG_TYPE_DEFAULT;
-        else if (flags & DNBLOG_FLAG_VERBOSE) log_type = OS_LOG_TYPE_DEBUG;
-        else                                  log_type = OS_LOG_TYPE_DEFAULT;
+  os_log_type_t log_type;
+  if (flags & DNBLOG_FLAG_FATAL)
+    log_type = OS_LOG_TYPE_FAULT;
+  else if (flags & DNBLOG_FLAG_ERROR)
+    log_type = OS_LOG_TYPE_ERROR;
+  else if (flags & DNBLOG_FLAG_WARNING)
+    log_type = OS_LOG_TYPE_DEFAULT;
+  else if (flags & DNBLOG_FLAG_VERBOSE)
+    log_type = OS_LOG_TYPE_DEBUG;
+  else
+    log_type = OS_LOG_TYPE_DEFAULT;
 
-        // This code is unfortunate.  os_log* only takes static strings, but
-        // our current log API isn't set up to make use of that style.
-        char buffer[LLDB_OS_LOG_MAX_BUFFER_LENGTH];
-        vsnprintf(buffer, sizeof(buffer), format, args);
-        os_log_with_type(g_logger, log_type, "%{public}s", buffer);
-    }
+  // This code is unfortunate.  os_log* only takes static strings, but
+  // our current log API isn't set up to make use of that style.
+  char buffer[LLDB_OS_LOG_MAX_BUFFER_LENGTH];
+  vsnprintf(buffer, sizeof(buffer), format, args);
+  os_log_with_type(g_logger, log_type, "%{public}s", buffer);
+}
 }
 
-DNBCallbackLog
-OsLogger::GetLogFunction()
-{
-    return _os_log_impl ? DarwinLogCallback : nullptr;
+DNBCallbackLog OsLogger::GetLogFunction() {
+  return _os_log_impl ? DarwinLogCallback : nullptr;
 }
 
 #else
 
-DNBCallbackLog
-OsLogger::GetLogFunction()
-{
-    return nullptr;
-}
+DNBCallbackLog OsLogger::GetLogFunction() { return nullptr; }
 
 #endif