From d67b0997d2c472a28996c37918c3119efc7e11af Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Mon, 23 Sep 2019 12:03:28 +0000 Subject: [PATCH] [LLDB] Add a void* cast when passing object pointers to printf %p This fixes build warnings in MinGW mode. Also remove leftover if (log) {} around the log macro. Differential Revision: https://reviews.llvm.org/D67896 llvm-svn: 372590 --- .../Host/windows/ConnectionGenericFileWindows.cpp | 24 +++++++++------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp b/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp index f6445d7..174ed73 100644 --- a/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp +++ b/lldb/source/Host/windows/ConnectionGenericFileWindows.cpp @@ -245,13 +245,11 @@ finish: IncrementFilePointer(return_info.GetBytes()); Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_CONNECTION)); - if (log) { - LLDB_LOGF(log, - "%p ConnectionGenericFile::Read() handle = %p, dst = %p, " - "dst_len = %zu) => %zu, error = %s", - this, m_file, dst, dst_len, return_info.GetBytes(), - return_info.GetError().AsCString()); - } + LLDB_LOGF(log, + "%p ConnectionGenericFile::Read() handle = %p, dst = %p, " + "dst_len = %zu) => %zu, error = %s", + static_cast(this), m_file, dst, dst_len, + return_info.GetBytes(), return_info.GetError().AsCString()); return return_info.GetBytes(); } @@ -296,13 +294,11 @@ finish: IncrementFilePointer(return_info.GetBytes()); Log *log(lldb_private::GetLogIfAnyCategoriesSet(LIBLLDB_LOG_CONNECTION)); - if (log) { - LLDB_LOGF(log, - "%p ConnectionGenericFile::Write() handle = %p, src = %p, " - "src_len = %zu) => %zu, error = %s", - this, m_file, src, src_len, return_info.GetBytes(), - return_info.GetError().AsCString()); - } + LLDB_LOGF(log, + "%p ConnectionGenericFile::Write() handle = %p, src = %p, " + "src_len = %zu) => %zu, error = %s", + static_cast(this), m_file, src, src_len, + return_info.GetBytes(), return_info.GetError().AsCString()); return return_info.GetBytes(); } -- 2.7.4