From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001
From: Kate Stone <katherine.stone@apple.com>
Date: Tue, 6 Sep 2016 20:57:50 +0000
Subject: =?UTF-8?q?***=20This=20commit=20represents=20a=20complete=20refor?=
 =?UTF-8?q?matting=20of=20the=20LLDB=20source=20code=20***=20to=20conform?=
 =?UTF-8?q?=20to=20clang-format=E2=80=99s=20LLVM=20style.=20=20This=20kind?=
 =?UTF-8?q?=20of=20mass=20change=20has=20***=20two=20obvious=20implication?=
 =?UTF-8?q?s:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 lldb/source/Utility/KQueue.cpp | 105 ++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 58 deletions(-)

(limited to 'lldb/source/Utility/KQueue.cpp')

diff --git a/lldb/source/Utility/KQueue.cpp b/lldb/source/Utility/KQueue.cpp
index c0aace4..56c0d1b 100644
--- a/lldb/source/Utility/KQueue.cpp
+++ b/lldb/source/Utility/KQueue.cpp
@@ -17,71 +17,60 @@
 
 using namespace lldb_private;
 
-int
-KQueue::GetFD (bool can_create)
-{
-    if (!IsValid () && can_create)
-        m_fd = kqueue();
-    return m_fd;
+int KQueue::GetFD(bool can_create) {
+  if (!IsValid() && can_create)
+    m_fd = kqueue();
+  return m_fd;
 }
 
-int
-KQueue::Close ()
-{
-    const int fd = m_fd;
-    if (fd >= 0)
-    {
-        m_fd = -1;
-        return close(fd);
-    }
-    return 0;
+int KQueue::Close() {
+  const int fd = m_fd;
+  if (fd >= 0) {
+    m_fd = -1;
+    return close(fd);
+  }
+  return 0;
 }
 
-int
-KQueue::WaitForEvents (struct kevent *events, int num_events, Error &error, uint32_t timeout_usec)
-{
-    const int fd_kqueue = GetFD(false);
-    if (fd_kqueue >= 0)
-    {
-        TimeSpecTimeout timeout;
-        const struct timespec *timeout_ptr = timeout.SetRelativeTimeoutMircoSeconds32 (timeout_usec);
-        int result = ::kevent(fd_kqueue, NULL, 0, events, num_events, timeout_ptr);
-        if (result == -1)
-            error.SetErrorToErrno();
-        else
-            error.Clear();
-        return result;
-    }
+int KQueue::WaitForEvents(struct kevent *events, int num_events, Error &error,
+                          uint32_t timeout_usec) {
+  const int fd_kqueue = GetFD(false);
+  if (fd_kqueue >= 0) {
+    TimeSpecTimeout timeout;
+    const struct timespec *timeout_ptr =
+        timeout.SetRelativeTimeoutMircoSeconds32(timeout_usec);
+    int result = ::kevent(fd_kqueue, NULL, 0, events, num_events, timeout_ptr);
+    if (result == -1)
+      error.SetErrorToErrno();
     else
-    {
-        error.SetErrorString("invalid kqueue fd");
-    }
-    return 0;
+      error.Clear();
+    return result;
+  } else {
+    error.SetErrorString("invalid kqueue fd");
+  }
+  return 0;
 }
 
-bool
-KQueue::AddFDEvent (int fd, bool read, bool write, bool vnode)
-{
-    const int fd_kqueue = GetFD(true);
-    if (fd_kqueue >= 0)
-    {
-        struct kevent event;
-        event.ident  = fd;
-        event.filter = 0;
-        if (read)
-            event.filter |= EVFILT_READ;
-        if (write)
-            event.filter |= EVFILT_WRITE;
-        if (vnode)
-            event.filter |= EVFILT_VNODE;
-        event.flags  = EV_ADD | EV_CLEAR;
-        event.fflags = 0;
-        event.data   = 0;
-        event.udata  = NULL;
-        int err = ::kevent(fd_kqueue, &event, 1, NULL, 0, NULL);
-        return err == 0;
-    }
-    return false;
+bool KQueue::AddFDEvent(int fd, bool read, bool write, bool vnode) {
+  const int fd_kqueue = GetFD(true);
+  if (fd_kqueue >= 0) {
+    struct kevent event;
+    event.ident = fd;
+    event.filter = 0;
+    if (read)
+      event.filter |= EVFILT_READ;
+    if (write)
+      event.filter |= EVFILT_WRITE;
+    if (vnode)
+      event.filter |= EVFILT_VNODE;
+    event.flags = EV_ADD | EV_CLEAR;
+    event.fflags = 0;
+    event.data = 0;
+    event.udata = NULL;
+    int err = ::kevent(fd_kqueue, &event, 1, NULL, 0, NULL);
+    return err == 0;
+  }
+  return false;
 }
 
 #endif
-- 
cgit v1.1