Changeset 46c20c8 in mainline for uspace/app/tester/stdio/stdio1.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/stdio/stdio1.c (modified) (2 diffs)

uspace/app/tester/stdio/stdio1.c

@@ -36 +36 @@
 static char buf[BUF_SIZE + 1];
 
-char *test_stdio1(void)
+const char *test_stdio1(void)
 {
         FILE *file;
-        char *file_name = "/readme";
+        const char *file_name = "/readme";
         
         TPRINTF("Open file \"%s\"...", file_name);
@@ -60 +60 @@
         
         buf[cnt] = '\0';
-        TPRINTF("Read %u bytes, string \"%s\"\n", cnt, buf);
+        TPRINTF("Read %zu bytes, string \"%s\"\n", cnt, buf);
         
         TPRINTF("Seek to beginning...");