Changeset 46c20c8 in mainline for uspace/srv/vfs/vfs.c

Timestamp:

2010-11-26T20:08:10Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

45df59a

Parents:

fb150d78 (diff), ffdd2b9 (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/srv/vfs/vfs.c (modified) (2 diffs)

uspace/srv/vfs/vfs.c

@@ -42 +42 @@
 #include <stdio.h>
 #include <bool.h>
-#include <string.h>
+#include <str.h>
 #include <as.h>
 #include <atomic.h>
@@ -72 +72 @@
                 ipc_call_t call;
                 ipc_callid_t callid = async_get_call(&call);
-                
-                fs_handle_t fs_handle;
-                int phone;
                 
                 switch (IPC_GET_METHOD(call)) {