Changes in uspace/app/init/init.c [1569a9b:b7fd2a0] in mainline

File:

• uspace/app/init/init.c (modified) (12 diffs)

uspace/app/init/init.c

@@ -79 +79 @@
 /** Report mount operation success */
 static bool mount_report(const char *desc, const char *mntpt,
-    const char *fstype, const char *dev, int rc)
+    const char *fstype, const char *dev, errno_t rc)
 {
         switch (rc) {
@@ -125 +125 @@
                 opts = "restore";
         
-        int rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, ROOT_DEVICE, opts,
+        errno_t rc = vfs_mount_path(ROOT_MOUNT_POINT, fstype, ROOT_DEVICE, opts,
             IPC_FLAG_BLOCKING, 0);
         if (rc == EOK)
@@ -144 +144 @@
 static bool mount_locfs(void)
 {
-        int rc = vfs_mount_path(LOCFS_MOUNT_POINT, LOCFS_FS_TYPE, "", "",
+        errno_t rc = vfs_mount_path(LOCFS_MOUNT_POINT, LOCFS_FS_TYPE, "", "",
             IPC_FLAG_BLOCKING, 0);
         return mount_report("Location service filesystem", LOCFS_MOUNT_POINT,
@@ -150 +150 @@
 }
 
-static int srv_startl(const char *path, ...)
+static errno_t srv_startl(const char *path, ...)
 {
         struct stat s;
@@ -174 +174 @@
         task_id_t id;
         task_wait_t wait;
-        int rc = task_spawn(&id, &wait, path, cnt, ap);
+        errno_t rc = task_spawn(&id, &wait, path, cnt, ap);
         va_end(ap);
         
@@ -211 +211 @@
 }
 
-static int console(const char *isvc, const char *osvc)
+static errno_t console(const char *isvc, const char *osvc)
 {
         /* Wait for the input service to be ready */
         service_id_t service_id;
-        int rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
+        errno_t rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
@@ -233 +233 @@
 }
 
-static int compositor(const char *isvc, const char *name)
+static errno_t compositor(const char *isvc, const char *name)
 {
         /* Wait for the input service to be ready */
         service_id_t service_id;
-        int rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
+        errno_t rc = loc_service_get_id(isvc, &service_id, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
                 printf("%s: Error waiting on %s (%s)\n", NAME, isvc,
@@ -256 +256 @@
         task_id_t id;
         task_wait_t wait;
-        int rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
+        errno_t rc = task_spawnl(&id, &wait, app, app, winreg, NULL);
         if (rc != EOK) {
                 printf("%s: Error spawning %s %s (%s)\n", NAME, app,
@@ -281 +281 @@
                     APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
                 
-                int rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+                errno_t rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--msg", "--wait", "--", app, NULL);
                 if (rc != EOK)
@@ -290 +290 @@
                     APP_GETTERM, svc, LOCFS_MOUNT_POINT, app);
                 
-                int rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
+                errno_t rc = task_spawnl(NULL, NULL, APP_GETTERM, APP_GETTERM, svc,
                     LOCFS_MOUNT_POINT, "--wait", "--", app, NULL);
                 if (rc != EOK)
@@ -300 +300 @@
 static bool mount_tmpfs(void)
 {
-        int rc = vfs_mount_path(TMPFS_MOUNT_POINT, TMPFS_FS_TYPE, "", "", 0, 0);
+        errno_t rc = vfs_mount_path(TMPFS_MOUNT_POINT, TMPFS_FS_TYPE, "", "", 0, 0);
         return mount_report("Temporary filesystem", TMPFS_MOUNT_POINT,
             TMPFS_FS_TYPE, NULL, rc);
@@ -307 +307 @@
 int main(int argc, char *argv[])
 {
-        int rc;
+        errno_t rc;
 
         info_print();