Changeset 0d0b319 in mainline for uspace/lib/posix/source/sys

Timestamp:

2018-01-04T20:03:02Z (8 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3c7702c0

Parents:

10de842

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 19:18:29)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-01-04 20:03:02)

Message:

Flip error constants to positive values, and update libposix for the change.

Location:

uspace/lib/posix/source/sys

Files:

• mman.c (modified) (1 diff)
• stat.c (modified) (4 diffs)
• wait.c (modified) (2 diffs)

uspace/lib/posix/source/sys/mman.c

@@ -59 +59 @@
 int posix_munmap(void *start, size_t length)
 {
-        return as_area_destroy(start);
+        int rc = as_area_destroy(start);
+        if (rc != EOK) {
+                errno = rc;
+                return -1;
+        }
+        return 0;
 }
 

uspace/lib/posix/source/sys/stat.c

@@ -41 +41 @@
 #include "libc/vfs/vfs.h"
 
-#include "posix/errno.h"
+#include <errno.h>
 #include "libc/mem.h"
 
@@ -89 +89 @@
 {
         struct stat hst;
-        int rc = rcerrno(vfs_stat, fd, &hst);
-        if (rc < 0)
+        if (failed(vfs_stat(fd, &hst)))
                 return -1;
         return stat_to_posix(st, &hst);
@@ -118 +117 @@
 {
         struct stat hst;
-        int rc = rcerrno(vfs_stat_path, path, &hst);
-        if (rc < 0)
+        if (failed(vfs_stat_path(path, &hst)))
                 return -1;
         return stat_to_posix(st, &hst);
@@ -159 +157 @@
 int posix_mkdir(const char *path, posix_mode_t mode)
 {
-        int rc = rcerrno(vfs_link_path, path, KIND_DIRECTORY, NULL);
-        if (rc != EOK)
+        if (failed(vfs_link_path(path, KIND_DIRECTORY, NULL)))
                 return -1;
         else

uspace/lib/posix/source/sys/wait.c

@@ -42 +42 @@
 #include "libc/task.h"
 #include "posix/assert.h"
-#include "posix/errno.h"
+
+#include <errno.h>
+
 #include "posix/limits.h"
 #include "posix/signal.h"
@@ -100 +102 @@
         int retval;
         
-        int rc = task_wait_task_id((task_id_t) pid, &texit, &retval);
-        
-        if (rc < 0) {
+        if (failed(task_wait_task_id((task_id_t) pid, &texit, &retval))) {
                 /* Unable to retrieve status. */
-                errno = -rc;
                 return (posix_pid_t) -1;
         }