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

Timestamp:

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

Author:

Jenda <jenda.jzqk73@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/stdio.c (modified) (7 diffs)

uspace/lib/posix/source/stdio.c

@@ -41 +41 @@
 
 #include "posix/assert.h"
-#include "posix/errno.h"
+
+#include <errno.h>
+
 #include "posix/stdlib.h"
 #include "posix/string.h"
@@ -313 +315 @@
 int posix_fflush(FILE *stream)
 {
-        return negerrno(fflush, stream);
+        return fflush(stream);
 }
 
@@ -343 +345 @@
 {
         const int fildes = *(int *) fd;
-        ssize_t wr = vfs_write(fildes, &posix_pos[fildes], str, size);
-        if (wr < 0)
-                return wr;
+        size_t wr;
+        if (failed(vfs_write(fildes, &posix_pos[fildes], str, size, &wr)))
+                return -1;
         return str_nlength(str, wr);
 }
@@ -371 +373 @@
                 
                 const int fildes = *(int *) fd;
-                if (vfs_write(fildes, &posix_pos[fildes], buf, sz) < 0)
+                size_t nwr;
+                if (vfs_write(fildes, &posix_pos[fildes], buf, sz, &nwr) != EOK)
                         break;
                 
@@ -574 +577 @@
 int posix_remove(const char *path)
 {
-        if (rcerrno(vfs_unlink_path, path) != EOK)
+        if (failed(vfs_unlink_path(path)))
                 return -1;
         else
@@ -589 +592 @@
 int posix_rename(const char *old, const char *new)
 {
-        int rc = rcerrno(vfs_rename_path, old, new);
-        if (rc != EOK)
+        if (failed(vfs_rename_path(old, new)))
                 return -1;
         else
@@ -662 +664 @@
                 
                 int orig_errno = errno;
-                errno = 0;
+                errno = EOK;
                 /* Check if the file exists. */
                 if (posix_access(result, F_OK) == -1) {