Changeset 6afc9d7 in mainline for uspace/app/tester

Timestamp:

2015-10-06T19:01:36Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0328987

Parents:

f1f7584

Message:

UNIX-like I/O functions should use errno to return error code for many reasons.

Location:

uspace/app/tester

Files:

• hw/misc/virtchar1.c (modified) (2 diffs)
• vfs/vfs1.c (modified) (3 diffs)

uspace/app/tester/hw/misc/virtchar1.c

@@ -58 +58 @@
         int fd = open(path, O_RDONLY);
         if (fd < 0) {
-                TPRINTF("   ...error: %s\n", str_error(fd));
+                TPRINTF("   ...error: %s\n", str_error(errno));
                 if (fd == ENOENT) {
                         TPRINTF("   (error was ENOENT: " \
@@ -69 +69 @@
         
         TPRINTF(" Asking for session...\n");
-        async_sess_t *sess = fd_session(fd, INTERFACE_DDF);
+        async_sess_t *sess = vfs_fd_session(fd, INTERFACE_DDF);
         if (!sess) {
                 close(fd);

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);