summaryrefslogtreecommitdiff
path: root/Userland/Applications/Browser
diff options
context:
space:
mode:
authorSam Atkins <atkinssj@serenityos.org>2022-01-20 17:47:39 +0000
committerAndreas Kling <kling@serenityos.org>2022-01-24 22:36:09 +0100
commit45cf40653a03dab11c0739783446ff696a9a5b0a (patch)
tree1611c797d1a43a106cf7220fcbdbba907f19d037 /Userland/Applications/Browser
parent140f1d9e55bfacb6f784bee591a6938714ed95b3 (diff)
downloadserenity-45cf40653a03dab11c0739783446ff696a9a5b0a.zip
Everywhere: Convert ByteBuffer factory methods from Optional -> ErrorOr
Apologies for the enormous commit, but I don't see a way to split this up nicely. In the vast majority of cases it's a simple change. A few extra places can use TRY instead of manual error checking though. :^)
Diffstat (limited to 'Userland/Applications/Browser')
-rw-r--r--Userland/Applications/Browser/BrowserWindow.cpp6
-rw-r--r--Userland/Applications/Browser/main.cpp18
2 files changed, 8 insertions, 16 deletions
diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp
index dfcb6188cd..99607fb094 100644
--- a/Userland/Applications/Browser/BrowserWindow.cpp
+++ b/Userland/Applications/Browser/BrowserWindow.cpp
@@ -387,11 +387,7 @@ ErrorOr<void> BrowserWindow::load_search_engines(GUI::Menu& settings_menu)
auto search_engines_file = TRY(Core::Stream::File::open(Browser::search_engines_file_path(), Core::Stream::OpenMode::Read));
auto file_size = TRY(search_engines_file->size());
- auto maybe_buffer = ByteBuffer::create_uninitialized(file_size);
- if (!maybe_buffer.has_value())
- return Error::from_string_literal("Unable to allocate buffer for reading search-engines file.");
-
- auto buffer = maybe_buffer.release_value();
+ auto buffer = TRY(ByteBuffer::create_uninitialized(file_size));
if (search_engines_file->read_or_error(buffer)) {
StringView buffer_contents { buffer.bytes() };
if (auto json = TRY(JsonValue::from_string(buffer_contents)); json.is_array()) {
diff --git a/Userland/Applications/Browser/main.cpp b/Userland/Applications/Browser/main.cpp
index 64d118264d..413bb68059 100644
--- a/Userland/Applications/Browser/main.cpp
+++ b/Userland/Applications/Browser/main.cpp
@@ -36,17 +36,13 @@ static ErrorOr<void> load_content_filters()
{
auto file = TRY(Core::Stream::File::open(String::formatted("{}/BrowserContentFilters.txt", Core::StandardPaths::config_directory()), Core::Stream::OpenMode::Read));
auto ad_filter_list = TRY(Core::Stream::BufferedFile::create(move(file)));
- auto maybe_buffer = ByteBuffer::create_uninitialized(4096);
- if (maybe_buffer.has_value()) {
- auto buffer = maybe_buffer.release_value();
-
- while (TRY(ad_filter_list->can_read_line())) {
- auto length = TRY(ad_filter_list->read_line(buffer));
- StringView line { buffer.data(), length };
- dbgln("Content filter for {}", line);
- if (!line.is_empty())
- Browser::g_content_filters.append(line);
- }
+ auto buffer = TRY(ByteBuffer::create_uninitialized(4096));
+ while (TRY(ad_filter_list->can_read_line())) {
+ auto length = TRY(ad_filter_list->read_line(buffer));
+ StringView line { buffer.data(), length };
+ dbgln("Content filter for {}", line);
+ if (!line.is_empty())
+ Browser::g_content_filters.append(line);
}
return {};