RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 03:57:43 +00:00
Code Issues Activity Actions

Userland: Get rid of the OwnPtr<...> boilerplate code for IPC handlers

Browse source
This commit is contained in:
Gunnar Beutner 2021-05-02 04:39:36 +02:00 • committed by Andreas Kling
parent 1a015dc379
commit 7cf2839a26
33 changed files with 389 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Services/SymbolServer/ClientConnection.cpp
View file

@ -35,12 +35,12 @@ void ClientConnection::die()
s_connections.remove(client_id());
}
OwnPtr<Messages::SymbolServer::GreetResponse> ClientConnection::handle(const Messages::SymbolServer::Greet&)
Messages::SymbolServer::GreetResponse ClientConnection::handle(const Messages::SymbolServer::Greet&)
{
return make<Messages::SymbolServer::GreetResponse>();
return {};
}
OwnPtr<Messages::SymbolServer::SymbolicateResponse> ClientConnection::handle(const Messages::SymbolServer::Symbolicate& message)
Messages::SymbolServer::SymbolicateResponse ClientConnection::handle(const Messages::SymbolServer::Symbolicate& message)
{
auto path = message.path();
if (!s_cache.contains(path)) {
@ -48,13 +48,13 @@ OwnPtr<Messages::SymbolServer::SymbolicateResponse> ClientConnection::handle(con
if (mapped_file.is_error()) {
dbgln("Failed to map {}: {}", path, mapped_file.error().string());
s_cache.set(path, {});
return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0);
return { false, String {}, 0, String {}, 0 };
}
auto elf = make<ELF::Image>(mapped_file.value()->bytes());
if (!elf->is_valid()) {
dbgln("ELF not valid: {}", path);
s_cache.set(path, {});
return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0);
return { false, String {}, 0, String {}, 0 };
}
Debug::DebugInfo debug_info(move(elf));
auto cached_elf = make<CachedELF>(mapped_file.release_value(), move(debug_info));
@ -66,7 +66,7 @@ OwnPtr<Messages::SymbolServer::SymbolicateResponse> ClientConnection::handle(con
auto& cached_elf = it->value;
if (!cached_elf)
return make<Messages::SymbolServer::SymbolicateResponse>(false, String {}, 0, String {}, 0);
return { false, String {}, 0, String {}, 0 };
u32 offset = 0;
auto symbol = cached_elf->debug_info.elf().symbolicate(message.address(), &offset);
@ -78,7 +78,7 @@ OwnPtr<Messages::SymbolServer::SymbolicateResponse> ClientConnection::handle(con
line_number = source_position.value().line_number;
}
return make<Messages::SymbolServer::SymbolicateResponse>(true, symbol, offset, filename, line_number);
return { true, symbol, offset, filename, line_number };
}
}