Changeset 132ab5d1 in mainline for uspace/lib/posix/source/fcntl.c

Timestamp:

2018-01-30T03:20:45Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5a6cc679

Parents:

8bfb163 (diff), 6a5d05b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '6a5d05bd2551e64111bea4f9332dd7448c26ce84' into forwardport

Separate return value from error code in gen_irq_code*().

File:

• uspace/lib/posix/source/fcntl.c (modified) (4 diffs)

uspace/lib/posix/source/fcntl.c

@@ -40 +40 @@
 
 #include "libc/vfs/vfs.h"
-#include "posix/errno.h"
+
+#include <errno.h>
 
 /**
@@ -103 +104 @@
 int posix_open(const char *pathname, int posix_flags, ...)
 {
-        int rc;
         posix_mode_t posix_mode = 0;
         if (posix_flags & O_CREAT) {
@@ -135 +135 @@
             ((posix_flags & O_APPEND) ? MODE_APPEND : 0);
 
-        int file = rcerrno(vfs_lookup, pathname, flags);
-        if (file < 0)
+        int file;
+
+        if (failed(vfs_lookup(pathname, flags, &file)))
                 return -1;
 
-        rc = rcerrno(vfs_open, file, mode);
-        if (rc != EOK) {
+        if (failed(vfs_open(file, mode))) {
                 vfs_put(file);
                 return -1;
@@ -147 +147 @@
         if (posix_flags & O_TRUNC) {
                 if (posix_flags & (O_RDWR | O_WRONLY)) {
-                        rc = rcerrno(vfs_resize, file, 0);
-                        if (rc != EOK) {
+                        if (failed(vfs_resize(file, 0))) {
                                 vfs_put(file);
                                 return -1;