Changes in uspace/app/trace/trace.c [6afc9d7:b8dbe2f] in mainline

File:

• uspace/app/trace/trace.c (modified) (5 diffs)

uspace/app/trace/trace.c

@@ -57 +57 @@
 #include "proto.h"
 #include <ipc/services.h>
-#include <ipc/vfs.h>
 #include <ipc/console.h>
 
@@ -528 +527 @@
         int fd_stderr;
         
-        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK))
+        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
                 files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK))
+        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
                 files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK))
+        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
                 files[2] = &fd_stderr;
         else
@@ -696 +695 @@
 
         p = proto_new("vfs");
-        o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_OPEN, o);
         o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
         proto_add_oper(p, VFS_IN_READ, o);
@@ -716 +713 @@
         o = oper_new("sync", 1, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_SYNC, o);
-        o = oper_new("mkdir", 1, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_MKDIR, o);
-        o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_UNLINK, o);
         o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def);
         proto_add_oper(p, VFS_IN_RENAME, o);
-        o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_STAT, o);
-        o = oper_new("statfs", 0, arg_def, V_ERRNO, 0, resp_def);
-        proto_add_oper(p, VFS_IN_STATFS, o);
+        o = oper_new("walk", 2, arg_def, V_INT_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_WALK, o);
+        o = oper_new("open2", 2, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_OPEN2, o);
+        o = oper_new("unlink2", 3, arg_def, V_ERRNO, 0, resp_def);
+        proto_add_oper(p, VFS_IN_UNLINK2, o);
 
         proto_register(SERVICE_VFS, p);
 }
 
-static void print_syntax(void)
+static void print_syntax()
 {
         printf("Syntax:\n");
@@ -876 +871 @@
                 printf("Waiting for task to exit.\n");
 
-                rc = task_wait_task_id(task_id, &texit, &retval);
+                rc = task_wait(task_id, &texit, &retval);
                 if (rc != EOK) {
                         printf("Failed waiting for task.\n");