Changeset 132ab5d1 in mainline for uspace/app/tester/vfs/vfs1.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/app/tester/vfs/vfs1.c (modified) (3 diffs)

uspace/app/tester/vfs/vfs1.c

@@ -31 +31 @@
 #include <stdlib.h>
 #include <stddef.h>
+#include <str_error.h>
 #include <str.h>
 #include <vfs/vfs.h>
@@ -72 +73 @@
         rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL);
         if (rc != EOK) {
-                TPRINTF("rc=%d\n", rc);
+                TPRINTF("rc=%s\n", str_error_name(rc));
                 return "vfs_link_path() failed";
         }
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);
         
-        int fd0 = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_READ | MODE_WRITE);
-        if (fd0 < 0)
+        int fd0;
+        rc = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE, &fd0);
+        if (rc != EOK)
                 return "vfs_lookup_open() failed";
         TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0);
         
         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 +96 @@
         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 = %s, cnt = %zu\n", str_error_name(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);
                 }
         }