diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp index ab009fd875..748d0f86a6 100644 --- a/Kernel/FileSystem/FIFO.cpp +++ b/Kernel/FileSystem/FIFO.cpp @@ -163,7 +163,7 @@ KResultOr FIFO::write(FileDescription&, u64, const UserOrKernelBuffer& b String FIFO::absolute_path(const FileDescription&) const { - return String::format("fifo:%u", m_fifo_id); + return String::formatted("fifo:{}", m_fifo_id); } KResult FIFO::stat(::stat& st) const diff --git a/Kernel/Net/IPv4SocketTuple.h b/Kernel/Net/IPv4SocketTuple.h index 9ad8e5a458..048708fb29 100644 --- a/Kernel/Net/IPv4SocketTuple.h +++ b/Kernel/Net/IPv4SocketTuple.h @@ -53,11 +53,11 @@ public: String to_string() const { - return String::format( - "%s:%d -> %s:%d", - m_local_address.to_string().characters(), + return String::formatted( + "{}:{} -> {}:{}", + m_local_address, m_local_port, - m_peer_address.to_string().characters(), + m_peer_address, m_peer_port); } diff --git a/Kernel/Net/NE2000NetworkAdapter.cpp b/Kernel/Net/NE2000NetworkAdapter.cpp index 0845da332d..c84c9f6639 100644 --- a/Kernel/Net/NE2000NetworkAdapter.cpp +++ b/Kernel/Net/NE2000NetworkAdapter.cpp @@ -210,7 +210,7 @@ UNMAP_AFTER_INIT NE2000NetworkAdapter::~NE2000NetworkAdapter() void NE2000NetworkAdapter::handle_irq(const RegisterState&) { u8 status = in8(REG_RW_INTERRUPTSTATUS); - dbgln_if(NE2000_DEBUG, "NE2000NetworkAdapter: Got interrupt, status=0x{}", String::format("%02x", status)); + dbgln_if(NE2000_DEBUG, "NE2000NetworkAdapter: Got interrupt, status={:#02x}", status); if (status & BIT_INTERRUPTMASK_PRX) { dbgln_if(NE2000_DEBUG, "NE2000NetworkAdapter: Interrupt for packet received"); diff --git a/Kernel/Scheduler.cpp b/Kernel/Scheduler.cpp index 99eb042295..2ea7d03a63 100644 --- a/Kernel/Scheduler.cpp +++ b/Kernel/Scheduler.cpp @@ -501,7 +501,7 @@ UNMAP_AFTER_INIT Thread* Scheduler::create_ap_idle_thread(u32 cpu) VERIFY(Processor::id() == 0); VERIFY(s_colonel_process); - Thread* idle_thread = s_colonel_process->create_kernel_thread(idle_loop, nullptr, THREAD_PRIORITY_MIN, String::format("idle thread #%u", cpu), 1 << cpu, false); + Thread* idle_thread = s_colonel_process->create_kernel_thread(idle_loop, nullptr, THREAD_PRIORITY_MIN, String::formatted("idle thread #{}", cpu), 1 << cpu, false); VERIFY(idle_thread); return idle_thread; }