diff --git a/AK/StringBuilder.cpp b/AK/StringBuilder.cpp index 39a16cbccf2..01371fdbe88 100644 --- a/AK/StringBuilder.cpp +++ b/AK/StringBuilder.cpp @@ -105,15 +105,9 @@ void StringBuilder::append_repeated(char ch, size_t n) MUST(try_append_repeated(ch, n)); } -ByteBuffer StringBuilder::to_byte_buffer() const +ErrorOr StringBuilder::to_byte_buffer() const { - // FIXME: Handle OOM failure. - return ByteBuffer::copy(data(), length()).release_value_but_fixme_should_propagate_errors(); -} - -ErrorOr StringBuilder::try_to_byte_buffer() const -{ - return TRY(ByteBuffer::copy(data(), length())); + return ByteBuffer::copy(data(), length()); } #ifndef KERNEL diff --git a/AK/StringBuilder.h b/AK/StringBuilder.h index 2fe6b28ad50..3cbfd23310d 100644 --- a/AK/StringBuilder.h +++ b/AK/StringBuilder.h @@ -68,8 +68,7 @@ public: ErrorOr to_string() const; ErrorOr to_fly_string() const; - [[nodiscard]] ByteBuffer to_byte_buffer() const; - [[nodiscard]] ErrorOr try_to_byte_buffer() const; + [[nodiscard]] ErrorOr to_byte_buffer() const; [[nodiscard]] StringView string_view() const; void clear(); diff --git a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp index 5e436fdf2f3..5127ccf6fe2 100644 --- a/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp +++ b/Userland/Applications/BrowserSettings/ContentFilterSettingsWidget.cpp @@ -50,7 +50,7 @@ ErrorOr DomainListModel::save() TRY(builder.try_appendff("{}\n", domain)); auto file = TRY(Core::File::open(filter_list_file_path(), Core::File::OpenMode::Write)); - TRY(file->write(TRY(builder.try_to_byte_buffer()).bytes())); + TRY(file->write(TRY(builder.to_byte_buffer()).bytes())); return {}; } diff --git a/Userland/Applications/CrashReporter/main.cpp b/Userland/Applications/CrashReporter/main.cpp index e08df1d82ec..4eb839c6a2b 100644 --- a/Userland/Applications/CrashReporter/main.cpp +++ b/Userland/Applications/CrashReporter/main.cpp @@ -277,7 +277,7 @@ ErrorOr serenity_main(Main::Arguments arguments) } auto file = file_or_error.release_value().release_stream(); - auto byte_buffer_or_error = full_backtrace.try_to_byte_buffer(); + auto byte_buffer_or_error = full_backtrace.to_byte_buffer(); if (byte_buffer_or_error.is_error()) { GUI::MessageBox::show(window, DeprecatedString::formatted("Couldn't create backtrace: {}.", byte_buffer_or_error.release_error()), "Saving backtrace failed"sv, GUI::MessageBox::Type::Error); return; diff --git a/Userland/Libraries/LibCore/MimeData.cpp b/Userland/Libraries/LibCore/MimeData.cpp index 7951172a3c8..7d28d044116 100644 --- a/Userland/Libraries/LibCore/MimeData.cpp +++ b/Userland/Libraries/LibCore/MimeData.cpp @@ -38,7 +38,7 @@ ErrorOr MimeData::set_urls(Vector const& urls) TRY(builder.try_append(url.to_deprecated_string())); TRY(builder.try_append('\n')); } - set_data("text/uri-list", TRY(builder.try_to_byte_buffer())); + set_data("text/uri-list", TRY(builder.to_byte_buffer())); return {}; } diff --git a/Userland/Libraries/LibGL/GLContext.cpp b/Userland/Libraries/LibGL/GLContext.cpp index 49510ea0e2e..7fa770636cd 100644 --- a/Userland/Libraries/LibGL/GLContext.cpp +++ b/Userland/Libraries/LibGL/GLContext.cpp @@ -952,7 +952,7 @@ ErrorOr GLContext::build_extension_string() TRY(string_builder.try_join(' ', extensions)); // Create null-terminated string - auto extensions_bytes = TRY(string_builder.try_to_byte_buffer()); + auto extensions_bytes = TRY(string_builder.to_byte_buffer()); TRY(extensions_bytes.try_append(0)); return extensions_bytes; } diff --git a/Userland/Libraries/LibGUI/Model.cpp b/Userland/Libraries/LibGUI/Model.cpp index 7689bc4413b..87ea46ea592 100644 --- a/Userland/Libraries/LibGUI/Model.cpp +++ b/Userland/Libraries/LibGUI/Model.cpp @@ -125,7 +125,7 @@ RefPtr Model::mime_data(ModelSelection const& selection) const } }); - mime_data->set_data(drag_data_type(), data_builder.try_to_byte_buffer().release_value_but_fixme_should_propagate_errors()); + mime_data->set_data(drag_data_type(), data_builder.to_byte_buffer().release_value_but_fixme_should_propagate_errors()); mime_data->set_text(text_builder.to_deprecated_string()); if (bitmap) mime_data->set_data("image/x-raw-bitmap", bitmap->serialize_to_byte_buffer().release_value_but_fixme_should_propagate_errors()); diff --git a/Userland/Libraries/LibGemini/GeminiRequest.cpp b/Userland/Libraries/LibGemini/GeminiRequest.cpp index 14287b390fe..a66cdb8942e 100644 --- a/Userland/Libraries/LibGemini/GeminiRequest.cpp +++ b/Userland/Libraries/LibGemini/GeminiRequest.cpp @@ -15,7 +15,7 @@ ErrorOr GeminiRequest::to_raw_request() const StringBuilder builder; TRY(builder.try_append(m_url.to_deprecated_string())); TRY(builder.try_append("\r\n"sv)); - return builder.try_to_byte_buffer(); + return builder.to_byte_buffer(); } Optional GeminiRequest::from_raw_request(ByteBuffer const& raw_request) diff --git a/Userland/Libraries/LibHTTP/HttpRequest.cpp b/Userland/Libraries/LibHTTP/HttpRequest.cpp index 0a33e227abc..b213cf9bc65 100644 --- a/Userland/Libraries/LibHTTP/HttpRequest.cpp +++ b/Userland/Libraries/LibHTTP/HttpRequest.cpp @@ -72,7 +72,7 @@ ErrorOr HttpRequest::to_raw_request() const TRY(builder.try_append((char const*)m_body.data(), m_body.size())); } TRY(builder.try_append("\r\n"sv)); - return builder.try_to_byte_buffer(); + return builder.to_byte_buffer(); } Optional HttpRequest::from_raw_request(ReadonlyBytes raw_request) diff --git a/Userland/Libraries/LibIMAP/QuotedPrintable.cpp b/Userland/Libraries/LibIMAP/QuotedPrintable.cpp index 31461c08ab4..7e0fd509391 100644 --- a/Userland/Libraries/LibIMAP/QuotedPrintable.cpp +++ b/Userland/Libraries/LibIMAP/QuotedPrintable.cpp @@ -80,7 +80,7 @@ ErrorOr decode_quoted_printable(StringView input) } } - return output.try_to_byte_buffer(); + return output.to_byte_buffer(); } } diff --git a/Userland/Libraries/LibWeb/WebDriver/Client.cpp b/Userland/Libraries/LibWeb/WebDriver/Client.cpp index 70c3bdd3d3b..093e01f88c3 100644 --- a/Userland/Libraries/LibWeb/WebDriver/Client.cpp +++ b/Userland/Libraries/LibWeb/WebDriver/Client.cpp @@ -220,7 +220,7 @@ ErrorOr Client::on_ready_to_read() break; } - m_request = HTTP::HttpRequest::from_raw_request(TRY(builder.try_to_byte_buffer())); + m_request = HTTP::HttpRequest::from_raw_request(TRY(builder.to_byte_buffer())); if (!m_request.has_value()) return {}; @@ -278,7 +278,7 @@ ErrorOr Client::send_success_response(JsonValue resu builder.appendff("Content-Length: {}\r\n", content.length()); builder.append("\r\n"sv); - auto builder_contents = TRY(builder.try_to_byte_buffer()); + auto builder_contents = TRY(builder.to_byte_buffer()); TRY(m_socket->write(builder_contents)); while (!content.is_empty()) { @@ -319,8 +319,8 @@ ErrorOr Client::send_error_response(Error const& err header_builder.appendff("Content-Length: {}\r\n", content_builder.length()); header_builder.append("\r\n"sv); - TRY(m_socket->write(TRY(header_builder.try_to_byte_buffer()))); - TRY(m_socket->write(TRY(content_builder.try_to_byte_buffer()))); + TRY(m_socket->write(TRY(header_builder.to_byte_buffer()))); + TRY(m_socket->write(TRY(content_builder.to_byte_buffer()))); log_response(error.http_status); return {}; diff --git a/Userland/Services/TelnetServer/Client.cpp b/Userland/Services/TelnetServer/Client.cpp index 0550ab85ac7..33e6aa9f670 100644 --- a/Userland/Services/TelnetServer/Client.cpp +++ b/Userland/Services/TelnetServer/Client.cpp @@ -182,7 +182,7 @@ ErrorOr Client::send_data(StringView data) } } - auto builder_contents = TRY(builder.try_to_byte_buffer()); + auto builder_contents = TRY(builder.to_byte_buffer()); TRY(m_socket->write(builder_contents)); return {}; } diff --git a/Userland/Services/WebServer/Client.cpp b/Userland/Services/WebServer/Client.cpp index c68dc720ea0..45e5c9cdb00 100644 --- a/Userland/Services/WebServer/Client.cpp +++ b/Userland/Services/WebServer/Client.cpp @@ -81,7 +81,7 @@ void Client::start() builder.append("\r\n"sv); } - auto request = builder.try_to_byte_buffer().release_value_but_fixme_should_propagate_errors(); + auto request = builder.to_byte_buffer().release_value_but_fixme_should_propagate_errors(); dbgln_if(WEBSERVER_DEBUG, "Got raw request: '{}'", DeprecatedString::copy(request)); auto maybe_did_handle = handle_request(request); @@ -191,7 +191,7 @@ ErrorOr Client::send_response(Stream& response, HTTP::HttpRequest const& r builder.appendff("Content-Length: {}\r\n", content_info.length); builder.append("\r\n"sv); - auto builder_contents = TRY(builder.try_to_byte_buffer()); + auto builder_contents = TRY(builder.to_byte_buffer()); TRY(m_socket->write(builder_contents)); log_response(200, request); @@ -233,7 +233,7 @@ ErrorOr Client::send_redirect(StringView redirect_path, HTTP::HttpRequest builder.append("\r\n"sv); builder.append("\r\n"sv); - auto builder_contents = TRY(builder.try_to_byte_buffer()); + auto builder_contents = TRY(builder.to_byte_buffer()); TRY(m_socket->write(builder_contents)); log_response(301, request); @@ -363,8 +363,8 @@ ErrorOr Client::send_error_response(unsigned code, HTTP::HttpRequest const header_builder.append("Content-Type: text/html; charset=UTF-8\r\n"sv); header_builder.appendff("Content-Length: {}\r\n", content_builder.length()); header_builder.append("\r\n"sv); - TRY(m_socket->write(TRY(header_builder.try_to_byte_buffer()))); - TRY(m_socket->write(TRY(content_builder.try_to_byte_buffer()))); + TRY(m_socket->write(TRY(header_builder.to_byte_buffer()))); + TRY(m_socket->write(TRY(content_builder.to_byte_buffer()))); log_response(code, request); return {};