Changeset 79ea5af in mainline for uspace/app/tester

Timestamp:

2017-03-30T20:47:53Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

67e881c

Parents:

ae7bfbbd

Message:

Rename unlink() to vfs_unlink_path() and _vfs_unlink() to vfs_unlink()

• Also, remove rmdir()

Location:

uspace/app/tester

Files:

• mm/pager1.c (modified) (2 diffs)
• vfs/vfs1.c (modified) (1 diff)

uspace/app/tester/mm/pager1.c

@@ -28 +28 @@
 
 #include <stdio.h>
-#include <unistd.h>
+#include <vfs/vfs.h>
 #include <fcntl.h>
 #include <stdlib.h>
@@ -51 +51 @@
         if (fd < 0)
                 return NULL;
-        (void) unlink(TEST_FILE);
+        (void) vfs_unlink_path(TEST_FILE);
 
         if (write(fd, (aoff64_t []) {0}, text, sizeof(text)) != sizeof(text)) {

uspace/app/tester/vfs/vfs1.c

@@ -117 +117 @@
         TPRINTF("Renamed %s to %s\n", TEST_FILE, TEST_FILE2);
         
-        if (unlink(TEST_FILE2) != 0)
-                return "unlink() failed";
+        if (vfs_unlink_path(TEST_FILE2) != EOK)
+                return "vfs_unlink_path() failed";
         TPRINTF("Unlinked %s\n", TEST_FILE2);
         
-        if (rmdir(TEST_DIRECTORY) != 0)
-                return "rmdir() failed";
+        if (vfs_unlink_path(TEST_DIRECTORY) != EOK)
+                return "vfs_unlink_path() failed";
         TPRINTF("Removed directory %s\n", TEST_DIRECTORY);