diff --git a/Userland/Services/DHCPClient/DHCPv4.h b/Userland/Services/DHCPClient/DHCPv4.h index c09f66ee5b..b3165633b4 100644 --- a/Userland/Services/DHCPClient/DHCPv4.h +++ b/Userland/Services/DHCPClient/DHCPv4.h @@ -153,12 +153,12 @@ struct ParsedDHCPv4Options { { StringBuilder builder; builder.append("DHCP Options ("); - builder.appendf("%zu", options.size()); + builder.appendff("{}", options.size()); builder.append(" entries)\n"); for (auto& opt : options) { - builder.appendf("\toption %d (%d bytes):", (u8)opt.key, (u8)opt.value.length); + builder.appendff("\toption {} ({} bytes):", (u8)opt.key, (u8)opt.value.length); for (auto i = 0; i < opt.value.length; ++i) - builder.appendf(" %u ", ((const u8*)opt.value.value)[i]); + builder.appendff(" {} ", ((const u8*)opt.value.value)[i]); builder.append('\n'); } return builder.build(); diff --git a/Userland/Services/SystemServer/Service.cpp b/Userland/Services/SystemServer/Service.cpp index bc92b03c50..b3cb8fd8ed 100644 --- a/Userland/Services/SystemServer/Service.cpp +++ b/Userland/Services/SystemServer/Service.cpp @@ -196,7 +196,7 @@ void Service::spawn(int socket_fd) VERIFY(m_sockets.size() == 1); int fd = dup(socket_fd); - builder.appendf("%s:%d", m_sockets[0].path.characters(), fd); + builder.appendff("{}:{}", m_sockets[0].path, fd); } else { // We were spawned as a regular process, so dup every socket for this // service and let the service know via SOCKET_TAKEOVER. @@ -205,8 +205,8 @@ void Service::spawn(int socket_fd) int new_fd = dup(socket.fd); if (i != 0) - builder.append(" "); - builder.appendf("%s:%d", socket.path.characters(), new_fd); + builder.append(' '); + builder.appendff("{}:{}", socket.path, new_fd); } } diff --git a/Userland/Services/WebServer/Client.cpp b/Userland/Services/WebServer/Client.cpp index 4a24eaf1f8..ca9931abbf 100644 --- a/Userland/Services/WebServer/Client.cpp +++ b/Userland/Services/WebServer/Client.cpp @@ -214,14 +214,14 @@ void Client::handle_directory_listing(const String& requested_path, const String bool is_directory = S_ISDIR(st.st_mode) || name.is_one_of(".", ".."); builder.append(""); - builder.appendf("
", is_directory ? "folder" : "file"); + builder.appendff("
", is_directory ? "folder" : "file"); builder.append(""); builder.append(escape_html_entities(name)); builder.append(" "); - builder.appendf("%10" PRIi64 " ", st.st_size); + builder.appendff("{:10} ", st.st_size); builder.append(""); builder.append(Core::DateTime::from_timestamp(st.st_mtime).to_string()); builder.append(""); @@ -242,11 +242,11 @@ void Client::handle_directory_listing(const String& requested_path, const String void Client::send_error_response(unsigned code, const StringView& message, const HTTP::HttpRequest& request) { StringBuilder builder; - builder.appendf("HTTP/1.0 %u ", code); + builder.appendff("HTTP/1.0 {} ", code); builder.append(message); builder.append("\r\n\r\n"); builder.append("

"); - builder.appendf("%u ", code); + builder.appendff("{} ", code); builder.append(message); builder.append("

"); m_socket->write(builder.to_string());