diff options
author | Pedro Pereira <pmh.pereira@gmail.com> | 2021-11-22 20:34:22 +0000 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-11-22 21:56:20 +0100 |
commit | 0ed3520ef5c84ad1cfb9640ebe1b4c2fac690f0e (patch) | |
tree | 69c5d134ca362d7e48d00fc5057047efe2c62331 | |
parent | 272f7c340e10e9b60a45bf4e1f0cf64e381beb58 (diff) | |
download | serenity-0ed3520ef5c84ad1cfb9640ebe1b4c2fac690f0e.zip |
Starfield: Port to LibMain
Simplified two pledge() by using TRY().
-rw-r--r-- | Userland/Demos/Starfield/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Userland/Demos/Starfield/Starfield.cpp | 20 |
2 files changed, 8 insertions, 14 deletions
diff --git a/Userland/Demos/Starfield/CMakeLists.txt b/Userland/Demos/Starfield/CMakeLists.txt index 7dc5b0ecaf..b9ddd1afab 100644 --- a/Userland/Demos/Starfield/CMakeLists.txt +++ b/Userland/Demos/Starfield/CMakeLists.txt @@ -8,4 +8,4 @@ set(SOURCES ) serenity_app(Starfield ICON app-screensaver) -target_link_libraries(Starfield LibGUI LibCore LibGfx) +target_link_libraries(Starfield LibGUI LibCore LibGfx LibMain) diff --git a/Userland/Demos/Starfield/Starfield.cpp b/Userland/Demos/Starfield/Starfield.cpp index bdee1528f0..6a417d679b 100644 --- a/Userland/Demos/Starfield/Starfield.cpp +++ b/Userland/Demos/Starfield/Starfield.cpp @@ -13,9 +13,10 @@ #include <LibGUI/Widget.h> #include <LibGUI/Window.h> #include <LibGfx/Bitmap.h> +#include <LibMain/Main.h> +#include <LibSystem/Wrappers.h> #include <stdio.h> #include <time.h> -#include <unistd.h> struct Coordinate { int x; @@ -146,13 +147,9 @@ void Starfield::draw() painter.fill_rect(m_bitmap->rect(), Color::Black); } -int main(int argc, char** argv) +ErrorOr<int> 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)); unsigned star_count = 1000; unsigned refresh_rate = 16; @@ -163,14 +160,11 @@ int main(int argc, char** argv) args_parser.add_option(star_count, "Number of stars to draw (default = 1000)", "stars", 'c', "number"); args_parser.add_option(refresh_rate, "Refresh rate (default = 16)", "rate", 'r', "milliseconds"); args_parser.add_option(speed, "Speed (default = 1)", "speed", 's', "number"); - args_parser.parse(argc, argv); + args_parser.parse(arguments.argc, arguments.argv); - 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)); auto app_icon = GUI::Icon::default_icon("app-screensaver"); auto window = GUI::Window::construct(); |