Changeset 241f1985 in mainline for uspace/app/sysctl/main.c

Timestamp:

2019-08-31T10:45:17Z (6 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

102f641

Parents:

f92b315

git-author:

Matthieu Riolo <matthieu.riolo@…> (2019-08-23 22:04:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-31 10:45:17)

Message:

Correcting failure from previous merge

The commits from Michal Koutný from the branch system-daemon
where built on a old version of Helenos. Because of this
many types and API functions have changed. This commit
upgrades the merge code

File:

• uspace/app/sysctl/main.c (modified) (5 diffs)

uspace/app/sysctl/main.c

@@ -39 +39 @@
 #include <str_error.h>
 #include <sysman/ctl.h>
-#include <unistd.h>
+#include <fibril.h>
+
 
 #define NAME "sysctl"
@@ -66 +67 @@
 }
 
-static int list_units(int argc, char *argv[])
+static errno_t list_units(int argc, char *argv[])
 {
         unit_handle_t *units;
         size_t unit_cnt;
 
-        int rc = sysman_get_units(&units, &unit_cnt);
+        errno_t rc = sysman_get_units(&units, &unit_cnt);
         if (rc != EOK) {
                 return rc;
@@ -98 +99 @@
 }
 
-static int start(int argc, char *argv[])
+static errno_t start(int argc, char *argv[])
 {
         unit_handle_t handle;
         char *unit_name = argv[1];
 
-        int rc = sysman_unit_handle(unit_name, &handle);
+        errno_t rc = sysman_unit_handle(unit_name, &handle);
         if (rc != EOK) {
                 printf("Cannot obtain handle for unit '%s' (%s).\n",
@@ -120 +121 @@
 }
 
-static int stop(int argc, char *argv[])
+static errno_t stop(int argc, char *argv[])
 {
         unit_handle_t handle;
         char *unit_name = argv[1];
 
-        int rc = sysman_unit_handle(unit_name, &handle);
+        errno_t rc = sysman_unit_handle(unit_name, &handle);
         if (rc != EOK) {
                 printf("Cannot obtain handle for unit '%s' (%s).\n",
@@ -142 +143 @@
 }
 
-static int shutdown(int argc, char *argv[])
+static errno_t shutdown(int argc, char *argv[])
 {
         const int delay = 3;
         printf("Will shutdown in %i seconds...\n", delay);
-        sleep(delay);
+        fibril_sleep(delay);
         printf("Shutdown now.\n");
 
-        int rc = sysman_shutdown();
+        errno_t rc = sysman_shutdown();
         if (rc != EOK) {
                 printf("Shutdown request failed: %s.\n", str_error(rc));