From 6e6228d40d86a39ceeede0bd0a5c07d029885704 Mon Sep 17 00:00:00 2001 From: Pedro Pereira Date: Mon, 22 Nov 2021 22:37:30 +0000 Subject: [PATCH] Breakout: Port to LibMain Simplified two pledge() and two unveil() by using TRY(). --- Userland/Games/Breakout/CMakeLists.txt | 2 +- Userland/Games/Breakout/main.cpp | 28 ++++++++------------------ 2 files changed, 9 insertions(+), 21 deletions(-) diff --git a/Userland/Games/Breakout/CMakeLists.txt b/Userland/Games/Breakout/CMakeLists.txt index 0cd3d1d1fd6..3fad09eb26f 100644 --- a/Userland/Games/Breakout/CMakeLists.txt +++ b/Userland/Games/Breakout/CMakeLists.txt @@ -11,4 +11,4 @@ set(SOURCES ) serenity_app(Breakout ICON app-breakout) -target_link_libraries(Breakout LibGUI) +target_link_libraries(Breakout LibGUI LibMain) diff --git a/Userland/Games/Breakout/main.cpp b/Userland/Games/Breakout/main.cpp index 789f49f1fb7..ef8a28997ca 100644 --- a/Userland/Games/Breakout/main.cpp +++ b/Userland/Games/Breakout/main.cpp @@ -11,31 +11,19 @@ #include #include #include -#include +#include +#include -int main(int argc, char** argv) +ErrorOr serenity_main(Main::Arguments arguments) { - if (pledge("stdio recvfd sendfd rpath unix", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(System::pledge("stdio recvfd sendfd rpath unix", nullptr)); - auto app = GUI::Application::construct(argc, argv); + auto app = GUI::Application::construct(arguments.argc, arguments.argv); - if (pledge("stdio recvfd sendfd rpath", nullptr) < 0) { - perror("pledge"); - return 1; - } + TRY(System::pledge("stdio recvfd sendfd rpath", nullptr)); - if (unveil("/res", "r") < 0) { - perror("unveil"); - return 1; - } - - if (unveil(nullptr, nullptr) < 0) { - perror("unveil"); - return 1; - } + TRY(System::unveil("/res", "r")); + TRY(System::unveil(nullptr, nullptr)); auto window = GUI::Window::construct(); window->resize(Breakout::Game::game_width, Breakout::Game::game_height);