Changeset ff381a7 in mainline for uspace/app/tester/vfs/vfs1.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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 mainline changes.

File:

• uspace/app/tester/vfs/vfs1.c (modified) (3 diffs)

uspace/app/tester/vfs/vfs1.c

@@ -70 +70 @@
 const char *test_vfs1(void)
 {
-        int rc;
-        if ((rc = mkdir(TEST_DIRECTORY, 0)) != 0) {
-                TPRINTF("rc=%d\n", rc);
+        if (mkdir(TEST_DIRECTORY, 0) != 0) {
+                TPRINTF("rc=%d\n", errno);
                 return "mkdir() failed";
         }
@@ -93 +92 @@
         
         char buf[BUF_SIZE];
+        TPRINTF("read..\n");
         while ((cnt = read(fd0, buf, BUF_SIZE))) {
+                TPRINTF("read returns %zd\n", cnt);
                 if (cnt < 0)
                         return "read() failed";
@@ -112 +113 @@
                 return rv;
         
-        if (rename(TEST_FILE, TEST_FILE2))
+        if (rename(TEST_FILE, TEST_FILE2) != 0)
                 return "rename() failed";
         TPRINTF("Renamed %s to %s\n", TEST_FILE, TEST_FILE2);
         
-        if (unlink(TEST_FILE2))
+        if (unlink(TEST_FILE2) != 0)
                 return "unlink() failed";
         TPRINTF("Unlinked %s\n", TEST_FILE2);
         
-        if (rmdir(TEST_DIRECTORY))
+        if (rmdir(TEST_DIRECTORY) != 0)
                 return "rmdir() failed";
         TPRINTF("Removed directory %s\n", TEST_DIRECTORY);