Changes in uspace/app/tester/vfs/vfs1.c [f77c1c9:8d2dd7f2] in mainline

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>
@@ -73 +72 @@
         rc = vfs_link_path(TEST_DIRECTORY, KIND_DIRECTORY, NULL);
         if (rc != EOK) {
-                TPRINTF("rc=%s\n", str_error_name(rc));
+                TPRINTF("rc=%d\n", rc);
                 return "vfs_link_path() failed";
         }
         TPRINTF("Created directory %s\n", TEST_DIRECTORY);
         
-        int fd0;
-        rc = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
-            MODE_READ | MODE_WRITE, &fd0);
-        if (rc != EOK)
+        int fd0 = vfs_lookup_open(TEST_FILE, WALK_REGULAR | WALK_MAY_CREATE,
+            MODE_READ | MODE_WRITE);
+        if (fd0 < 0)
                 return "vfs_lookup_open() failed";
         TPRINTF("Created file %s (fd=%d)\n", TEST_FILE, fd0);
         
         size_t size = sizeof(text);
-        size_t cnt;
-        rc  = vfs_write(fd0, &pos, text, size, &cnt);
-        if (rc != EOK)
+        ssize_t cnt = vfs_write(fd0, &pos, text, size);
+        if (cnt < 0)
                 return "write() failed";
         TPRINTF("Written %zd bytes\n", cnt);
@@ -96 +93 @@
         char buf[BUF_SIZE];
         TPRINTF("read..\n");
-        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)
+        while ((cnt = vfs_read(fd0, &pos, buf, BUF_SIZE))) {
+                TPRINTF("read returns %zd\n", cnt);
+                if (cnt < 0)
                         return "read() failed";
                 
-                int icnt = (int) cnt;
-                if ((size_t) icnt != cnt) {
+                int _cnt = (int) cnt;
+                if (_cnt != cnt) {
                         /* Count overflow, just to be sure. */
                         TPRINTF("Read %zd bytes\n", cnt);
                 } else {
-                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, icnt, buf);
+                        TPRINTF("Read %zd bytes: \"%.*s\"\n", cnt, _cnt, buf);
                 }
         }