From 5e93db93fc24bf78f2d1e6858fa02eaadde326a1 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 23 Nov 2021 10:39:52 +0100 Subject: [PATCH] ImageDecoder: Port to LibMain :^) --- Userland/Services/ImageDecoder/CMakeLists.txt | 2 +- Userland/Services/ImageDecoder/main.cpp | 21 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/Userland/Services/ImageDecoder/CMakeLists.txt b/Userland/Services/ImageDecoder/CMakeLists.txt index 9677a1c15b..16f6609ab6 100644 --- a/Userland/Services/ImageDecoder/CMakeLists.txt +++ b/Userland/Services/ImageDecoder/CMakeLists.txt @@ -14,4 +14,4 @@ set(SOURCES ) serenity_bin(ImageDecoder) -target_link_libraries(ImageDecoder LibGfx LibIPC) +target_link_libraries(ImageDecoder LibGfx LibIPC LibMain) diff --git a/Userland/Services/ImageDecoder/main.cpp b/Userland/Services/ImageDecoder/main.cpp index 515d81c6f0..fc1588144b 100644 --- a/Userland/Services/ImageDecoder/main.cpp +++ b/Userland/Services/ImageDecoder/main.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020, Andreas Kling + * Copyright (c) 2020-2021, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -8,24 +8,17 @@ #include #include #include +#include +#include -int main(int, char**) +ErrorOr serenity_main(Main::Arguments) { Core::EventLoop event_loop; - if (pledge("stdio recvfd sendfd unix", nullptr) < 0) { - perror("pledge"); - return 1; - } - if (unveil(nullptr, nullptr) < 0) { - perror("unveil"); - return 1; - } + TRY(System::pledge("stdio recvfd sendfd unix", nullptr)); + TRY(System::unveil(nullptr, nullptr)); auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server(); IPC::new_client_connection(socket.release_nonnull(), 1); - if (pledge("stdio recvfd sendfd", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(System::pledge("stdio recvfd sendfd", nullptr)); return event_loop.exec(); }