From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** 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: 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/Target/FileAction.cpp | 142 +++++++++++++++----------------------- 1 file changed, 57 insertions(+), 85 deletions(-) (limited to 'lldb/source/Target/FileAction.cpp') diff --git a/lldb/source/Target/FileAction.cpp b/lldb/source/Target/FileAction.cpp index 06d0529fe3e..46678b11f3a 100644 --- a/lldb/source/Target/FileAction.cpp +++ b/lldb/source/Target/FileAction.cpp @@ -19,101 +19,73 @@ using namespace lldb_private; // FileAction member functions //---------------------------------------------------------------------------- -FileAction::FileAction() : - m_action(eFileActionNone), - m_fd(-1), - m_arg(-1), - m_file_spec() -{ -} +FileAction::FileAction() + : m_action(eFileActionNone), m_fd(-1), m_arg(-1), m_file_spec() {} -void -FileAction::Clear() -{ - m_action = eFileActionNone; - m_fd = -1; - m_arg = -1; - m_file_spec.Clear(); +void FileAction::Clear() { + m_action = eFileActionNone; + m_fd = -1; + m_arg = -1; + m_file_spec.Clear(); } -const char * -FileAction::GetPath() const -{ - return m_file_spec.GetCString(); -} +const char *FileAction::GetPath() const { return m_file_spec.GetCString(); } -const FileSpec & -FileAction::GetFileSpec() const -{ - return m_file_spec; -} +const FileSpec &FileAction::GetFileSpec() const { return m_file_spec; } -bool -FileAction::Open(int fd, const FileSpec &file_spec, bool read, bool write) -{ - if ((read || write) && fd >= 0 && file_spec) - { - m_action = eFileActionOpen; - m_fd = fd; - if (read && write) - m_arg = O_NOCTTY | O_CREAT | O_RDWR; - else if (read) - m_arg = O_NOCTTY | O_RDONLY; - else - m_arg = O_NOCTTY | O_CREAT | O_WRONLY; - m_file_spec = file_spec; - return true; - } +bool FileAction::Open(int fd, const FileSpec &file_spec, bool read, + bool write) { + if ((read || write) && fd >= 0 && file_spec) { + m_action = eFileActionOpen; + m_fd = fd; + if (read && write) + m_arg = O_NOCTTY | O_CREAT | O_RDWR; + else if (read) + m_arg = O_NOCTTY | O_RDONLY; else - { - Clear(); - } - return false; + m_arg = O_NOCTTY | O_CREAT | O_WRONLY; + m_file_spec = file_spec; + return true; + } else { + Clear(); + } + return false; } -bool -FileAction::Close(int fd) -{ - Clear(); - if (fd >= 0) - { - m_action = eFileActionClose; - m_fd = fd; - } - return m_fd >= 0; +bool FileAction::Close(int fd) { + Clear(); + if (fd >= 0) { + m_action = eFileActionClose; + m_fd = fd; + } + return m_fd >= 0; } -bool -FileAction::Duplicate(int fd, int dup_fd) -{ - Clear(); - if (fd >= 0 && dup_fd >= 0) - { - m_action = eFileActionDuplicate; - m_fd = fd; - m_arg = dup_fd; - } - return m_fd >= 0; +bool FileAction::Duplicate(int fd, int dup_fd) { + Clear(); + if (fd >= 0 && dup_fd >= 0) { + m_action = eFileActionDuplicate; + m_fd = fd; + m_arg = dup_fd; + } + return m_fd >= 0; } -void -FileAction::Dump(Stream &stream) const -{ - stream.PutCString("file action: "); - switch (m_action) - { - case eFileActionClose: - stream.Printf("close fd %d", m_fd); - break; - case eFileActionDuplicate: - stream.Printf("duplicate fd %d to %d", m_fd, m_arg); - break; - case eFileActionNone: - stream.PutCString("no action"); - break; - case eFileActionOpen: - stream.Printf("open fd %d with '%s', OFLAGS = 0x%x", - m_fd, m_file_spec.GetCString(), m_arg); - break; - } +void FileAction::Dump(Stream &stream) const { + stream.PutCString("file action: "); + switch (m_action) { + case eFileActionClose: + stream.Printf("close fd %d", m_fd); + break; + case eFileActionDuplicate: + stream.Printf("duplicate fd %d to %d", m_fd, m_arg); + break; + case eFileActionNone: + stream.PutCString("no action"); + break; + case eFileActionOpen: + stream.Printf("open fd %d with '%s', OFLAGS = 0x%x", m_fd, + m_file_spec.GetCString(), m_arg); + break; + } } -- cgit v1.2.3