Changeset 0d0b319 in mainline for uspace/lib/posix/source/unistd.c

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.

File:

• uspace/lib/posix/source/unistd.c (modified) (14 diffs)

uspace/lib/posix/source/unistd.c

@@ -40 +40 @@
 #include "posix/unistd.h"
 
-#include "posix/errno.h"
+#include <errno.h>
+
 #include "posix/string.h"
 #include "posix/fcntl.h"
@@ -52 +53 @@
 #include <libarch/config.h>
 
+// FIXME: replace with a hash table
 aoff64_t posix_pos[MAX_OPEN_FILES];
 
@@ -126 +128 @@
 char *posix_getcwd(char *buf, size_t size)
 {
-        int rc = rcerrno(vfs_cwd_get, buf, size);
-        if (rc != EOK) 
+        if (failed(vfs_cwd_get(buf, size))) 
                 return NULL;
         return buf;
@@ -139 +140 @@
 int posix_chdir(const char *path)
 {
-        int rc = rcerrno(vfs_cwd_set, path);
-        if (rc != EOK)
+        if (failed(vfs_cwd_set(path)))
                 return -1;
         return 0;
@@ -196 +196 @@
 {
         posix_pos[fildes] = 0;
-        int rc = rcerrno(vfs_put, fildes);
-        if (rc != EOK)
+        if (failed(vfs_put(fildes)))
                 return -1;
         else
@@ -214 +213 @@
 {
         size_t nread;
-        int rc;
-
-        rc = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte, &nread);
-        if (rc != EOK)
+        if (failed(vfs_read(fildes, &posix_pos[fildes], buf, nbyte, &nread)))
                 return -1;
         return (ssize_t) nread;
@@ -233 +229 @@
 {
         size_t nwr;
-        int rc;
-
-        rc = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte, &nwr);
-        if (rc != EOK)
+        if (failed(vfs_write(fildes, &posix_pos[fildes], buf, nbyte, &nwr)))
                 return -1;
         return nwr;
@@ -253 +246 @@
 {
         struct stat st;
-        int rc;
 
         switch (whence) {
@@ -263 +255 @@
                 break;
         case SEEK_END:
-                rc = rcerrno(vfs_stat, fildes, &st);
-                if (rc != EOK)
+                if (failed(vfs_stat(fildes, &st)))
                         return -1;
                 posix_pos[fildes] = st.size + offset;
@@ -285 +276 @@
 int posix_fsync(int fildes)
 {
-        if (rcerrno(vfs_sync, fildes) != EOK)
+        if (failed(vfs_sync(fildes)))
                 return -1;
         else
@@ -300 +291 @@
 int posix_ftruncate(int fildes, posix_off_t length)
 {
-        if (rcerrno(vfs_resize, fildes, (aoff64_t) length) != EOK)
+        if (failed(vfs_resize(fildes, (aoff64_t) length)))
                 return -1;
         else
@@ -314 +305 @@
 int posix_rmdir(const char *path)
 {
-        if (rcerrno(vfs_unlink_path, path) != EOK)
+        if (failed(vfs_unlink_path(path)))
                 return -1;
         else
@@ -328 +319 @@
 int posix_unlink(const char *path)
 {
-        if (rcerrno(vfs_unlink_path, path) != EOK)
+        if (failed(vfs_unlink_path(path)))
                 return -1;
         else
@@ -356 +347 @@
 {
         int file;
-        int rc = vfs_clone(fildes, fildes2, false, &file);
-        if (rc != EOK) {
-                errno = rc < 0 ? -rc : rc;
+        if (failed(vfs_clone(fildes, fildes2, false, &file))) {
                 return -1;
         }