Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions lldb/include/lldb/lldb-types.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ typedef unsigned thread_result_t; // Host thread result type
typedef thread_result_t (*thread_func_t)(void *); // Host thread function type
typedef void *pipe_t; // Host pipe type is HANDLE

// printf macro for file_t
#define PRIuFT PRIuPTR

#else

#include <pthread.h>
Expand All @@ -66,9 +63,6 @@ typedef void *thread_result_t; // Host thread result type
typedef void *(*thread_func_t)(void *); // Host thread function type
typedef int pipe_t; // Host pipe type

// printf macro for file_t
#define PRIuFT PRIi32

#endif // _WIN32

#define LLDB_INVALID_PROCESS ((lldb::process_t)-1)
Expand Down
24 changes: 10 additions & 14 deletions lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,11 @@ size_t ConnectionFileDescriptor::Read(void *dst, size_t dst_len,
error = m_io_sp->Read(dst, bytes_read);

if (log) {
LLDB_LOGF(log,
"%p ConnectionFileDescriptor::Read() fd = %" PRIuFT
", dst = %p, dst_len = %" PRIu64 ") => %" PRIu64 ", error = %s",
static_cast<void *>(this),
static_cast<file_t>(m_io_sp->GetWaitableHandle()),
static_cast<void *>(dst), static_cast<uint64_t>(dst_len),
static_cast<uint64_t>(bytes_read), error.AsCString());
LLDB_LOG(log,
"{0} ConnectionFileDescriptor::Read() fd = {1}"
", dst = {2}, dst_len = {3}) => {4}, error = {5}",
this, m_io_sp->GetWaitableHandle(), dst, dst_len, bytes_read,
error.AsCString());
}

if (bytes_read == 0) {
Expand Down Expand Up @@ -376,13 +374,11 @@ size_t ConnectionFileDescriptor::Write(const void *src, size_t src_len,
error = m_io_sp->Write(src, bytes_sent);

if (log) {
LLDB_LOGF(log,
"%p ConnectionFileDescriptor::Write(fd = %" PRIuFT
", src = %p, src_len = %" PRIu64 ") => %" PRIu64 " (error = %s)",
static_cast<void *>(this),
static_cast<file_t>(m_io_sp->GetWaitableHandle()),
static_cast<const void *>(src), static_cast<uint64_t>(src_len),
static_cast<uint64_t>(bytes_sent), error.AsCString());
LLDB_LOG(log,
"{0} ConnectionFileDescriptor::Write(fd = {1}"
", src = {2}, src_len = {3}) => {4} (error = {5})",
this, m_io_sp->GetWaitableHandle(), src, src_len, bytes_sent,
error.AsCString());
}

if (error_ptr)
Expand Down