Changes in uspace/app/shutdown/shutdown.c [f35749e:0d00e53] in mainline

File:

• uspace/app/shutdown/shutdown.c (modified) (6 diffs)

uspace/app/shutdown/shutdown.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2025 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <fibril_synch.h>
 #include <nchoice.h>
-#include <shutdown.h>
 #include <stdio.h>
 #include <stdbool.h>
@@ -114 +113 @@
 
         rc = nchoice_add(nchoice, "Power off", (void *)(uintptr_t)sd_poweroff,
-            0);
-        if (rc != EOK) {
-                printf(NAME ": Out of memory.\n");
-                goto error;
-        }
-
-        rc = nchoice_add(nchoice, "Restart", (void *)(uintptr_t)sd_restart,
             0);
         if (rc != EOK) {
@@ -165 +157 @@
                         action = sd_poweroff;
                         continue;
-                } else if (str_cmp(*argv, "-r") == 0) {
-                        --argc;
-                        ++argv;
-                        action = sd_restart;
-                        continue;
                 }
 
@@ -200 +187 @@
         }
 
-        switch (action) {
-        case sd_poweroff:
-                rc = system_poweroff(system);
-                break;
-        case sd_restart:
-                rc = system_restart(system);
-                break;
-        case sd_cancel:
-                assert(false);
-                rc = EINVAL;
-                break;
-        }
-
+        rc = system_shutdown(system);
         if (rc != EOK) {
                 system_close(system);
@@ -248 +223 @@
             "\tshutdown [<options>]\n"
             "options:\n"
-            "\t-p Power off\n"
-            "\t-r Restart off\n");
+            "\t-p Power off\n");
 }