llvmbot wrote:
<!--LLVM PR SUMMARY COMMENT--> @llvm/pr-subscribers-lldb Author: David Spickett (DavidSpickett) <details> <summary>Changes</summary> We don't want this as part of the public API, and using LLDB_LOG avoids some warnings when compiling on Windows. --- Full diff: https://github.com/llvm/llvm-project/pull/146867.diff 2 Files Affected: - (modified) lldb/include/lldb/lldb-types.h (-6) - (modified) lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp (+10-14) ``````````diff diff --git a/lldb/include/lldb/lldb-types.h b/lldb/include/lldb/lldb-types.h index 4c07e5abc4424..e309fc8833ce9 100644 --- a/lldb/include/lldb/lldb-types.h +++ b/lldb/include/lldb/lldb-types.h @@ -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> @@ -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) diff --git a/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp b/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp index 83eb0c56853b3..e8bf04e308447 100644 --- a/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp +++ b/lldb/source/Host/posix/ConnectionFileDescriptorPosix.cpp @@ -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) { @@ -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) `````````` </details> https://github.com/llvm/llvm-project/pull/146867 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
