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

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

Browse source
This commit is contained in:
Andreas Kling 2021-04-21 23:34:49 +02:00
parent f4eff7df8f
commit 83d3003208
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibDebug/DebugInfo.cpp
View file

@ -156,12 +156,12 @@ Optional<DebugInfo::SourcePositionAndAddress> DebugInfo::get_address_from_source
{ {
String file_path = file; String file_path = file;
if (!file_path.starts_with("/")) if (!file_path.starts_with("/"))
file_path = String::format("/%s", file_path.characters()); file_path = String::formatted("/{}", file_path);
constexpr char SERENITY_LIBS_PREFIX[] = "/usr/src/serenity"; constexpr char SERENITY_LIBS_PREFIX[] = "/usr/src/serenity";
if (file.starts_with(SERENITY_LIBS_PREFIX)) { if (file.starts_with(SERENITY_LIBS_PREFIX)) {
file_path = file.substring(sizeof(SERENITY_LIBS_PREFIX), file.length() - sizeof(SERENITY_LIBS_PREFIX)); file_path = file.substring(sizeof(SERENITY_LIBS_PREFIX), file.length() - sizeof(SERENITY_LIBS_PREFIX));
file_path = String::format("../%s", file_path.characters()); file_path = String::formatted("../{}", file_path);
} }
Optional<SourcePositionAndAddress> result; Optional<SourcePositionAndAddress> result;

4
Userland/Libraries/LibDebug/DebugSession.cpp
View file

@ -411,7 +411,7 @@ Optional<DebugSession::InsertBreakpointAtSourcePositionResult> DebugSession::ins
void DebugSession::update_loaded_libs() void DebugSession::update_loaded_libs()
{ {
auto file = Core::File::construct(String::format("/proc/%u/vm", m_debuggee_pid)); auto file = Core::File::construct(String::formatted("/proc/{}/vm", m_debuggee_pid));
bool rc = file->open(Core::IODevice::ReadOnly); bool rc = file->open(Core::IODevice::ReadOnly);
VERIFY(rc); VERIFY(rc);
@ -432,7 +432,7 @@ void DebugSession::update_loaded_libs()
auto lib_name = result.capture_group_matches.at(0).at(0).view.u8view().to_string(); auto lib_name = result.capture_group_matches.at(0).at(0).view.u8view().to_string();
if (lib_name.starts_with("/")) if (lib_name.starts_with("/"))
return lib_name; return lib_name;
return String::format("/usr/lib/%s", lib_name.characters()); return String::formatted("/usr/lib/{}", lib_name);
}; };
vm_entries.for_each([&](auto& entry) { vm_entries.for_each([&](auto& entry) {