Changeset ff381a7 in mainline for uspace/app/trace/trace.c

Timestamp:

2015-11-02T20:54:19Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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/trace/trace.c (modified) (2 diffs)

uspace/app/trace/trace.c

@@ -57 +57 @@
 #include "proto.h"
 #include <ipc/services.h>
-#include "../../srv/vfs/vfs.h"
+#include <ipc/vfs.h>
 #include <ipc/console.h>
 
@@ -528 +528 @@
         int fd_stderr;
         
-        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
+        if ((stdin != NULL) && (vfs_fhandle(stdin, &fd_stdin) == EOK))
                 files[0] = &fd_stdin;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
+        if ((stdout != NULL) && (vfs_fhandle(stdout, &fd_stdout) == EOK))
                 files[1] = &fd_stdout;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
+        if ((stderr != NULL) && (vfs_fhandle(stderr, &fd_stderr) == EOK))
                 files[2] = &fd_stderr;
         else