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

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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)
@@ -79 +79 @@
         TPRINTF("Created directory %s\n", MOUNT_POINT);
         
-        char null[MAX_DEVICE_NAME];
-        int null_id = devmap_null_create();
-        
-        if (null_id == -1)
-                return "Unable to create null device";
-        
-        snprintf(null, MAX_DEVICE_NAME, "null%d", null_id);
-        int rc = mount(FS_TYPE, MOUNT_POINT, null, OPTIONS, FLAGS);
+        int rc = mount(FS_TYPE, MOUNT_POINT, "", OPTIONS, FLAGS);
         switch (rc) {
         case EOK:
-                TPRINTF("Mounted /dev/%s as %s on %s\n", null, FS_TYPE, MOUNT_POINT);
+                TPRINTF("Mounted %s on %s\n", FS_TYPE, MOUNT_POINT);
                 break;
         case EBUSY:
@@ -128 +121 @@
         close(fd0);
         
-        char *rv = read_root();
+        const char *rv = read_root();
         if (rv != NULL)
                 return rv;