diff --git a/AK/StringBuilder.cpp b/AK/StringBuilder.cpp index 524f0a3d9c..ed9c1d1087 100644 --- a/AK/StringBuilder.cpp +++ b/AK/StringBuilder.cpp @@ -184,7 +184,7 @@ void StringBuilder::append_escaped_for_json(StringView string) break; default: if (ch >= 0 && ch <= 0x1f) - append(String::formatted("\\u{:04x}", ch)); + appendff("\\u{:04x}", ch); else append(ch); } diff --git a/Kernel/GlobalProcessExposed.cpp b/Kernel/GlobalProcessExposed.cpp index 6ddc661d27..df78cd1c5f 100644 --- a/Kernel/GlobalProcessExposed.cpp +++ b/Kernel/GlobalProcessExposed.cpp @@ -131,7 +131,7 @@ private: JsonArraySerializer array { builder }; LocalSocket::for_each([&array](auto& socket) { auto obj = array.add_object(); - obj.add("path", String(socket.socket_path())); + obj.add("path", socket.socket_path()); obj.add("origin_pid", socket.origin_pid().value()); obj.add("origin_uid", socket.origin_uid().value()); obj.add("origin_gid", socket.origin_gid().value()); @@ -463,7 +463,7 @@ private: ENUMERATE_PLEDGE_PROMISES #undef __ENUMERATE_PLEDGE_PROMISE - process_object.add("pledge", pledge_builder.to_string()); + process_object.add("pledge", pledge_builder.string_view()); switch (process.veil_state()) { case VeilState::None: @@ -756,7 +756,7 @@ private: { if (!Process::current().is_superuser()) return EPERM; - return builder.append(String::number(kernel_load_base)); + return builder.appendff("{}", kernel_load_base); } }; diff --git a/Kernel/KBufferBuilder.cpp b/Kernel/KBufferBuilder.cpp index e7f9b8b55f..edc6fe227e 100644 --- a/Kernel/KBufferBuilder.cpp +++ b/Kernel/KBufferBuilder.cpp @@ -121,7 +121,7 @@ ErrorOr KBufferBuilder::append_escaped_for_json(StringView string) break; default: if (ch >= 0 && ch <= 0x1f) - TRY(append(String::formatted("\\u{:04x}", ch))); + TRY(appendff("\\u{:04x}", ch)); else TRY(append(ch)); } diff --git a/Kernel/Net/IPv4Socket.cpp b/Kernel/Net/IPv4Socket.cpp index a061b26208..3cfdc74998 100644 --- a/Kernel/Net/IPv4Socket.cpp +++ b/Kernel/Net/IPv4Socket.cpp @@ -497,7 +497,7 @@ ErrorOr> IPv4Socket::pseudo_path(const OpenFileDescriptio VERIFY_NOT_REACHED(); } - return KString::try_create(builder.to_string()); + return KString::try_create(builder.string_view()); } ErrorOr IPv4Socket::setsockopt(int level, int option, Userspace user_value, socklen_t user_value_size) diff --git a/Kernel/Net/LocalSocket.cpp b/Kernel/Net/LocalSocket.cpp index 73205c85c2..d07c15ca27 100644 --- a/Kernel/Net/LocalSocket.cpp +++ b/Kernel/Net/LocalSocket.cpp @@ -378,7 +378,7 @@ ErrorOr> LocalSocket::pseudo_path(const OpenFileDescripti break; } - return KString::try_create(builder.to_string()); + return KString::try_create(builder.string_view()); } ErrorOr LocalSocket::getsockopt(OpenFileDescription& description, int level, int option, Userspace value, Userspace value_size) diff --git a/Kernel/ProcessSpecificExposed.cpp b/Kernel/ProcessSpecificExposed.cpp index d19031aa67..906895b5f5 100644 --- a/Kernel/ProcessSpecificExposed.cpp +++ b/Kernel/ProcessSpecificExposed.cpp @@ -159,7 +159,7 @@ ErrorOr Process::procfs_get_unveil_stats(KBufferBuilder& builder) const permissions_builder.append('c'); if (unveiled_path.permissions() & UnveilAccess::Browse) permissions_builder.append('b'); - obj.add("permissions", permissions_builder.to_string()); + obj.add("permissions", permissions_builder.string_view()); } array.finish(); return {}; @@ -255,7 +255,7 @@ ErrorOr Process::procfs_get_virtual_memory_stats(KBufferBuilder& builder) else pagemap_builder.append('P'); } - region_object.add("pagemap", pagemap_builder.to_string()); + region_object.add("pagemap", pagemap_builder.string_view()); } } array.finish(); diff --git a/Kernel/Syscalls/mmap.cpp b/Kernel/Syscalls/mmap.cpp index cf06604220..0ac03dc0d0 100644 --- a/Kernel/Syscalls/mmap.cpp +++ b/Kernel/Syscalls/mmap.cpp @@ -520,7 +520,7 @@ ErrorOr Process::sys$allocate_tls(Userspace initial_data, return EINVAL; auto range = TRY(address_space().try_allocate_range({}, size)); - auto* region = TRY(address_space().allocate_region(range, String("Master TLS"), PROT_READ | PROT_WRITE)); + auto* region = TRY(address_space().allocate_region(range, "Master TLS"sv, PROT_READ | PROT_WRITE)); m_master_tls_region = region->make_weak_ptr(); m_master_tls_size = size;