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

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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) (5 diffs)

uspace/app/tester/vfs/vfs1.c

@@ -30 +30 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <str.h>
 #include <vfs/vfs.h>
 #include <unistd.h>
@@ -54 +54 @@
 static char text[] = "Lorem ipsum dolor sit amet, consectetur adipisicing elit";
 
-static char *read_root(void)
+static const char *read_root(void)
 {
         TPRINTF("Opening the root directory...");
@@ -73 +73 @@
 }
 
-char *test_vfs1(void)
+const char *test_vfs1(void)
 {
         if (mkdir(MOUNT_POINT, 0) != 0)
@@ -105 +105 @@
         if (cnt < 0)
                 return "write() failed";
-        TPRINTF("Written %d bytes\n", cnt);
+        TPRINTF("Written %zd bytes\n", cnt);
         
         if (lseek(fd0, 0, SEEK_SET) != 0)
@@ -116 +116 @@
                         return "read() failed";
                 
-                TPRINTF("Read %d bytes: \".*s\"\n", cnt, cnt, buf);
+                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, _cnt, buf);
+                }
         }
         
         close(fd0);
         
-        char *rv = read_root();
+        const char *rv = read_root();
         if (rv != NULL)
                 return rv;