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

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• uspace/app/tester/vfs/vfs1.c (modified) (4 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)
@@ -121 +121 @@
         close(fd0);
         
-        char *rv = read_root();
+        const char *rv = read_root();
         if (rv != NULL)
                 return rv;