Changeset 8e3498b in mainline for uspace/app/tester

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/app/tester

Files:

• mm/pager1.c (modified) (2 diffs)
• vfs/vfs1.c (modified) (2 diffs)

uspace/app/tester/mm/pager1.c

@@ -44 +44 @@
 static void *create_paged_area(size_t size)
 {
+        size_t nwr;
+        int rc;
+
         TPRINTF("Creating temporary file...\n");
 
@@ -52 +55 @@
         (void) vfs_unlink_path(TEST_FILE);
 
-        if (vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text)) < 0) {
+        rc = vfs_write(fd, (aoff64_t []) {0}, text, sizeof(text), &nwr);
+        if (rc != EOK) {
                 vfs_put(fd);
                 return NULL;

uspace/app/tester/vfs/vfs1.c

@@ -84 +84 @@
         
         size_t size = sizeof(text);
-        ssize_t cnt = vfs_write(fd0, &pos, text, size);
-        if (cnt < 0)
+        size_t cnt;
+        rc  = vfs_write(fd0, &pos, text, size, &cnt);
+        if (rc != EOK)
                 return "write() failed";
         TPRINTF("Written %zd bytes\n", cnt);
@@ -93 +94 @@
         char buf[BUF_SIZE];
         TPRINTF("read..\n");
-        while ((cnt = vfs_read(fd0, &pos, buf, BUF_SIZE))) {
-                TPRINTF("read returns %zd\n", cnt);
-                if (cnt < 0)
+        while ((rc = vfs_read(fd0, &pos, buf, BUF_SIZE, &cnt))) {
+                TPRINTF("read returns rc = %d, cnt = %zu\n", rc, cnt);
+                if (rc != EOK)
                         return "read() failed";
                 
-                int _cnt = (int) cnt;
-                if (_cnt != cnt) {
+                int icnt = (int) cnt;
+                if ((size_t) icnt != cnt) {
                         /* Count overflow, just to be sure. */
                         TPRINTF("Read %zd bytes\n", cnt);
                 } else {
-                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, _cnt, buf);
+                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, icnt, buf);
                 }
         }