Forráskód Böngészése

ImageDecoder: Port to LibMain :^)

Andreas Kling 3 éve
szülő
commit
5e93db93fc

+ 1 - 1
Userland/Services/ImageDecoder/CMakeLists.txt

@@ -14,4 +14,4 @@ set(SOURCES
 )
 )
 
 
 serenity_bin(ImageDecoder)
 serenity_bin(ImageDecoder)
-target_link_libraries(ImageDecoder LibGfx LibIPC)
+target_link_libraries(ImageDecoder LibGfx LibIPC LibMain)

+ 7 - 14
Userland/Services/ImageDecoder/main.cpp

@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
+ * Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
  *
  *
  * SPDX-License-Identifier: BSD-2-Clause
  * SPDX-License-Identifier: BSD-2-Clause
  */
  */
@@ -8,24 +8,17 @@
 #include <LibCore/EventLoop.h>
 #include <LibCore/EventLoop.h>
 #include <LibCore/LocalServer.h>
 #include <LibCore/LocalServer.h>
 #include <LibIPC/ClientConnection.h>
 #include <LibIPC/ClientConnection.h>
+#include <LibMain/Main.h>
+#include <LibSystem/Wrappers.h>
 
 
-int main(int, char**)
+ErrorOr<int> serenity_main(Main::Arguments)
 {
 {
     Core::EventLoop event_loop;
     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();
     auto socket = Core::LocalSocket::take_over_accepted_socket_from_system_server();
     IPC::new_client_connection<ImageDecoder::ClientConnection>(socket.release_nonnull(), 1);
     IPC::new_client_connection<ImageDecoder::ClientConnection>(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();
     return event_loop.exec();
 }
 }