From 63e5fb76ecfed3434252868d8cf07d676f979f2f Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Wed, 24 Jul 2019 17:56:10 +0000 Subject: [Logging] Replace Log::Printf with LLDB_LOG macro (NFC) This patch replaces explicit calls to log::Printf with the new LLDB_LOGF macro. The macro is similar to LLDB_LOG but supports printf-style format strings, instead of formatv-style format strings. So instead of writing: if (log) log->Printf("%s\n", str); You'd write: LLDB_LOG(log, "%s\n", str); This change was done mechanically with the command below. I replaced the spurious if-checks with vim, since I know how to do multi-line replacements with it. find . -type f -name '*.cpp' -exec \ sed -i '' -E 's/log->Printf\(/LLDB_LOGF\(log, /g' "{}" + Differential revision: https://reviews.llvm.org/D65128 llvm-svn: 366936 --- lldb/source/Target/ThreadPlanShouldStopHere.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'lldb/source/Target/ThreadPlanShouldStopHere.cpp') diff --git a/lldb/source/Target/ThreadPlanShouldStopHere.cpp b/lldb/source/Target/ThreadPlanShouldStopHere.cpp index a0b7072a107..9599d8197b0 100644 --- a/lldb/source/Target/ThreadPlanShouldStopHere.cpp +++ b/lldb/source/Target/ThreadPlanShouldStopHere.cpp @@ -46,8 +46,8 @@ bool ThreadPlanShouldStopHere::InvokeShouldStopHereCallback( lldb::addr_t current_addr = m_owner->GetThread().GetRegisterContext()->GetPC(0); - log->Printf("ShouldStopHere callback returned %u from 0x%" PRIx64 ".", - should_stop_here, current_addr); + LLDB_LOGF(log, "ShouldStopHere callback returned %u from 0x%" PRIx64 ".", + should_stop_here, current_addr); } } @@ -69,8 +69,7 @@ bool ThreadPlanShouldStopHere::DefaultShouldStopHereCallback( (operation == eFrameCompareSameParent && flags.Test(eStepInAvoidNoDebug))) { if (!frame->HasDebugInformation()) { - if (log) - log->Printf("Stepping out of frame with no debug info"); + LLDB_LOGF(log, "Stepping out of frame with no debug info"); should_stop_here = false; } @@ -118,16 +117,14 @@ ThreadPlanSP ThreadPlanShouldStopHere::DefaultStepFromHereCallback( symbol_end.Slide(sc.symbol->GetByteSize() - 1); if (range.ContainsFileAddress(sc.symbol->GetAddress()) && range.ContainsFileAddress(symbol_end)) { - if (log) - log->Printf("Stopped in a function with only line 0 lines, just " - "stepping out."); + LLDB_LOGF(log, "Stopped in a function with only line 0 lines, just " + "stepping out."); just_step_out = true; } } if (!just_step_out) { - if (log) - log->Printf("ThreadPlanShouldStopHere::DefaultStepFromHereCallback " - "Queueing StepInRange plan to step through line 0 code."); + LLDB_LOGF(log, "ThreadPlanShouldStopHere::DefaultStepFromHereCallback " + "Queueing StepInRange plan to step through line 0 code."); return_plan_sp = current_plan->GetThread().QueueThreadPlanForStepInRange( false, range, sc, nullptr, eOnlyDuringStepping, status, -- cgit v1.2.3