RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-15 04:34:59 +00:00
Code Issues Activity Actions

UserspaceEmulator: Convert String::format() => String::formatted()

Browse source
This commit is contained in:
Andreas Kling 2021-04-21 23:05:02 +02:00
parent c68dcf45b6
commit 0058a1173e
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Userland/DevTools/UserspaceEmulator/Emulator.cpp
View file

@ -294,7 +294,7 @@ const MmapRegion* Emulator::find_text_region(FlatPtr address)
String Emulator::create_backtrace_line(FlatPtr address) String Emulator::create_backtrace_line(FlatPtr address)
{ {
String minimal = String::format("=={%d}== %p", getpid(), (void*)address); auto minimal = String::formatted("=={{{}}}== {:p}", getpid(), (void*)address);
const auto* region = find_text_region(address); const auto* region = find_text_region(address);
if (!region) if (!region)
return minimal; return minimal;
@ -320,11 +320,11 @@ String Emulator::create_backtrace_line(FlatPtr address)
auto& elf = it->value.debug_info->elf(); auto& elf = it->value.debug_info->elf();
String symbol = elf.symbolicate(address - region->base()); String symbol = elf.symbolicate(address - region->base());
auto line_without_source_info = String::format("=={%d}== %p [%s]: %s", getpid(), (void*)address, lib_name.characters(), symbol.characters()); auto line_without_source_info = String::formatted("=={{{}}}== {:p} [{}]: {}", getpid(), (void*)address, lib_name, symbol);
auto source_position = it->value.debug_info->get_source_position(address - region->base()); auto source_position = it->value.debug_info->get_source_position(address - region->base());
if (source_position.has_value()) if (source_position.has_value())
return String::format("=={%d}== %p [%s]: %s (\033[34;1m%s\033[0m:%zu)", getpid(), (void*)address, lib_name.characters(), symbol.characters(), LexicalPath(source_position.value().file_path).basename().characters(), source_position.value().line_number); return String::formatted("=={{{}}}== {:p} [{}]: {} (\e[34;1m{}\e[0m:{})", getpid(), (void*)address, lib_name, symbol, LexicalPath(source_position.value().file_path).basename(), source_position.value().line_number);
return line_without_source_info; return line_without_source_info;
} }