Changeset 8e3498b in mainline for uspace/lib/posix

Timestamp:

2017-12-04T18:44:24Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bde5c04

Parents:

40feeac

Message:

vfs_read/write() should return error code separately from number of bytes transferred.

Location:

uspace/lib/posix/source

Files:

• stdio.c (modified) (2 diffs)
• unistd.c (modified) (2 diffs)

uspace/lib/posix/source/stdio.c

@@ -343 +343 @@
 {
         const int fildes = *(int *) fd;
-        ssize_t wr = vfs_write(fildes, &posix_pos[fildes], str, size);
-        if (wr < 0)
-                return wr;
+        size_t wr;
+        int rc = vfs_write(fildes, &posix_pos[fildes], str, size, &wr);
+        if (rc != EOK)
+                return rc;
         return str_nlength(str, wr);
 }
@@ -371 +372 @@
                 
                 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;
                 

uspace/lib/posix/source/unistd.c

@@ -213 +213 @@
 ssize_t posix_read(int fildes, void *buf, size_t nbyte)
 {
-        ssize_t size = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte);
-        if (size < 0)
-                return -1;
-        return size;
+        size_t nread;
+        int rc;
+
+        rc = rcerrno(vfs_read, fildes, &posix_pos[fildes], buf, nbyte, &nread);
+        if (rc != EOK)
+                return -1;
+        return (ssize_t) nread;
 }
 
@@ -229 +232 @@
 ssize_t posix_write(int fildes, const void *buf, size_t nbyte)
 {
-        ssize_t size = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte);
-        if (size < 0)
-                return -1;
-        return size;
+        size_t nwr;
+        int rc;
+
+        rc = rcerrno(vfs_write, fildes, &posix_pos[fildes], buf, nbyte, &nwr);
+        if (rc != EOK)
+                return -1;
+        return nwr;
 }