mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 18:32:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

WebServer: Make ErrorOr unwrapping more idiomatic

Browse source 
This still not propagates errors properly, but is at least (more)
consistent with the codebase.
This commit is contained in:
Maciej 2022-01-03 09:28:53 +01:00 • committed by Andreas Kling
parent 022b416570
commit e824a2da90
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Userland/Services/WebServer/Client.cpp
View file

@ -226,9 +226,8 @@ static String folder_image_data()
{
static String cache;
if (cache.is_empty()) {
auto file_or_error = Core::MappedFile::map("/res/icons/16x16/filetype-folder.png");
VERIFY(!file_or_error.is_error());
cache = encode_base64(file_or_error.value()->bytes());
auto file = Core::MappedFile::map("/res/icons/16x16/filetype-folder.png").release_value_but_fixme_should_propagate_errors();
cache = encode_base64(file->bytes());
}
return cache;
}
@ -237,9 +236,8 @@ static String file_image_data()
{
static String cache;
if (cache.is_empty()) {
auto file_or_error = Core::MappedFile::map("/res/icons/16x16/filetype-unknown.png");
VERIFY(!file_or_error.is_error());
cache = encode_base64(file_or_error.value()->bytes());
auto file = Core::MappedFile::map("/res/icons/16x16/filetype-unknown.png").release_value_but_fixme_should_propagate_errors();
cache = encode_base64(file->bytes());
}
return cache;
}

3
Userland/Services/WebServer/main.cpp
View file

@ -84,7 +84,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
return;
}
VERIFY(!maybe_buffered_socket.value().set_blocking(true).is_error());
// FIXME: Propagate errors
MUST(maybe_buffered_socket.value().set_blocking(true));
auto client = WebServer::Client::construct(maybe_buffered_socket.release_value(), server);
client->start();
};