diff options
Diffstat (limited to 'lldb/source/Host/common')
| -rw-r--r-- | lldb/source/Host/common/File.cpp | 16 | ||||
| -rw-r--r-- | lldb/source/Host/common/Terminal.cpp | 18 |
2 files changed, 17 insertions, 17 deletions
diff --git a/lldb/source/Host/common/File.cpp b/lldb/source/Host/common/File.cpp index 04fbf17ff6e..bf462135afa 100644 --- a/lldb/source/Host/common/File.cpp +++ b/lldb/source/Host/common/File.cpp @@ -528,18 +528,18 @@ Status File::Read(size_t &num_bytes, off_t &offset, bool null_terminate, num_bytes = bytes_left; size_t num_bytes_plus_nul_char = num_bytes + (null_terminate ? 1 : 0); - std::unique_ptr<DataBufferHeap> data_heap_ap; - data_heap_ap.reset(new DataBufferHeap()); - data_heap_ap->SetByteSize(num_bytes_plus_nul_char); + std::unique_ptr<DataBufferHeap> data_heap_up; + data_heap_up.reset(new DataBufferHeap()); + data_heap_up->SetByteSize(num_bytes_plus_nul_char); - if (data_heap_ap) { - error = Read(data_heap_ap->GetBytes(), num_bytes, offset); + if (data_heap_up) { + error = Read(data_heap_up->GetBytes(), num_bytes, offset); if (error.Success()) { // Make sure we read exactly what we asked for and if we got // less, adjust the array - if (num_bytes_plus_nul_char < data_heap_ap->GetByteSize()) - data_heap_ap->SetByteSize(num_bytes_plus_nul_char); - data_buffer_sp.reset(data_heap_ap.release()); + if (num_bytes_plus_nul_char < data_heap_up->GetByteSize()) + data_heap_up->SetByteSize(num_bytes_plus_nul_char); + data_buffer_sp.reset(data_heap_up.release()); return error; } } diff --git a/lldb/source/Host/common/Terminal.cpp b/lldb/source/Host/common/Terminal.cpp index b6d6f56704c..aa3d0e6b333 100644 --- a/lldb/source/Host/common/Terminal.cpp +++ b/lldb/source/Host/common/Terminal.cpp @@ -87,7 +87,7 @@ bool Terminal::SetCanonical(bool enabled) { TerminalState::TerminalState() : m_tty(), m_tflags(-1), #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED - m_termios_ap(), + m_termios_up(), #endif m_process_group(-1) { } @@ -101,7 +101,7 @@ void TerminalState::Clear() { m_tty.Clear(); m_tflags = -1; #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED - m_termios_ap.reset(); + m_termios_up.reset(); #endif m_process_group = -1; } @@ -118,11 +118,11 @@ bool TerminalState::Save(int fd, bool save_process_group) { m_tflags = ::fcntl(fd, F_GETFL, 0); #endif #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED - if (m_termios_ap == NULL) - m_termios_ap.reset(new struct termios); - int err = ::tcgetattr(fd, m_termios_ap.get()); + if (m_termios_up == NULL) + m_termios_up.reset(new struct termios); + int err = ::tcgetattr(fd, m_termios_up.get()); if (err != 0) - m_termios_ap.reset(); + m_termios_up.reset(); #endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED #ifndef LLDB_DISABLE_POSIX if (save_process_group) @@ -134,7 +134,7 @@ bool TerminalState::Save(int fd, bool save_process_group) { m_tty.Clear(); m_tflags = -1; #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED - m_termios_ap.reset(); + m_termios_up.reset(); #endif m_process_group = -1; } @@ -154,7 +154,7 @@ bool TerminalState::Restore() const { #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED if (TTYStateIsValid()) - tcsetattr(fd, TCSANOW, m_termios_ap.get()); + tcsetattr(fd, TCSANOW, m_termios_up.get()); #endif // #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED if (ProcessGroupIsValid()) { @@ -191,7 +191,7 @@ bool TerminalState::TFlagsIsValid() const { return m_tflags != -1; } //---------------------------------------------------------------------- bool TerminalState::TTYStateIsValid() const { #ifdef LLDB_CONFIG_TERMIOS_SUPPORTED - return m_termios_ap != 0; + return m_termios_up != 0; #else return false; #endif |
