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

Timestamp:

2010-11-26T14:19:00Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

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

uspace/app/tester/vfs/vfs1.c

@@ -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);
+                }
         }