mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 19:47:44 +00:00
Everywhere: Remove needless copies of Error / ErrorOr instances
Either take the underlying objects with release_* methods or move() the instances around.
This commit is contained in:
parent
52687814ea
commit
4a916cd379
28 changed files with 69 additions and 77 deletions
|
@ -238,8 +238,8 @@ public:
|
|||
|
||||
void request_file(Web::FileRequest request) override
|
||||
{
|
||||
auto const file = Core::System::open(request.path(), O_RDONLY);
|
||||
request.on_file_request_finish(file);
|
||||
auto file = Core::System::open(request.path(), O_RDONLY);
|
||||
request.on_file_request_finish(move(file));
|
||||
}
|
||||
|
||||
private:
|
||||
|
|
|
@ -65,10 +65,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
// Verify that all specified keymaps are loadable
|
||||
for (auto& keymap_name : mappings_vector) {
|
||||
auto keymap = Keyboard::CharacterMap::load_from_file(keymap_name);
|
||||
if (keymap.is_error()) {
|
||||
if (auto keymap = Keyboard::CharacterMap::load_from_file(keymap_name); keymap.is_error()) {
|
||||
warnln("Cannot load keymap {}: {}({})", keymap_name, keymap.error().string_literal(), keymap.error().code());
|
||||
return keymap.error();
|
||||
return keymap.release_error();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
auto stat = Core::System::lstat(path);
|
||||
|
||||
if (stat.is_error() && stat.error().code() != ENOENT)
|
||||
return stat.error();
|
||||
return stat.release_error();
|
||||
|
||||
if (!stat.is_error() && S_ISDIR(stat.value().st_mode)) {
|
||||
// The target path is a directory, so we presumably want <path>/<filename> as the effective path.
|
||||
|
|
|
@ -46,7 +46,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
auto result = Core::File::remove(path, recursive ? Core::File::RecursionMode::Allowed : Core::File::RecursionMode::Disallowed);
|
||||
|
||||
if (result.is_error()) {
|
||||
auto error = result.error();
|
||||
auto error = result.release_error();
|
||||
|
||||
if (force && error.is_errno() && error.code() == ENOENT)
|
||||
continue;
|
||||
|
|
|
@ -110,7 +110,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
if (event.type == Core::FileWatcherEvent::Type::ContentModified) {
|
||||
auto buffer_or_error = f->read_until_eof();
|
||||
if (buffer_or_error.is_error()) {
|
||||
auto error = buffer_or_error.error();
|
||||
auto error = buffer_or_error.release_error();
|
||||
warnln(error.string_literal());
|
||||
event_loop.quit(error.code());
|
||||
return;
|
||||
|
@ -120,7 +120,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
auto potential_error = f->seek(0, SeekMode::FromEndPosition);
|
||||
if (potential_error.is_error()) {
|
||||
auto error = potential_error.error();
|
||||
auto error = potential_error.release_error();
|
||||
warnln(error.string_literal());
|
||||
event_loop.quit(error.code());
|
||||
return;
|
||||
|
|
|
@ -181,7 +181,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
auto result_or_error = Core::System::mkdir(absolute_path, header_mode);
|
||||
if (result_or_error.is_error() && result_or_error.error().code() != EEXIST)
|
||||
return result_or_error.error();
|
||||
return result_or_error.release_error();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue