Kernel - Changed VFS_SelectNode to be able to watch multiple attribs

[tpg/acess2.git] / Kernel / vfs / memfile.c

diff --git a/Kernel/vfs/memfile.c b/Kernel/vfs/memfile.c
index 4120b20..c197626 100644 (file)
--- a/Kernel/vfs/memfile.c
+++ b/Kernel/vfs/memfile.c
@@ -7,7 +7,7 @@
 #include <vfs.h>
 
 // === PROTOTYPES ===
-tVFS_Node      *VFS_MemFile_Create(tVFS_Node *Unused, char *Path);
+tVFS_Node      *VFS_MemFile_Create(tVFS_Node *Unused, const char *Path);
 void   VFS_MemFile_Close(tVFS_Node *Node);
 Uint64 VFS_MemFile_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
 Uint64 VFS_MemFile_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
@@ -21,13 +21,13 @@ tVFS_Node   gVFS_MemRoot = {
 
 // === CODE ===
 /**
- * \fn tVFS_Node *VFS_MemFile_Create(tVFS_Node *Unused, char *Path)
+ * \fn tVFS_Node *VFS_MemFile_Create(tVFS_Node *Unused, const char *Path)
  * \note Treated as finddir by VFS_ParsePath
  */
-tVFS_Node *VFS_MemFile_Create(tVFS_Node *Unused, char *Path)
+tVFS_Node *VFS_MemFile_Create(tVFS_Node *Unused, const char *Path)
 {
        Uint    base, size;
-       char    *str = Path;
+       const char      *str = Path;
        tVFS_Node       *ret;
        
        str++;  // Eat '$'
@@ -60,8 +60,6 @@ tVFS_Node *VFS_MemFile_Create(tVFS_Node *Unused, char *Path)
        // Check for NULL byte
        if(*str != '\0')        return NULL;
        
-       Log(" VFS_MemFile_Create: base=0x%x, size=0x%x", base, size);
-       
        // Allocate and fill node
        ret = malloc(sizeof(tVFS_Node));
        memset(ret, 0, sizeof(tVFS_Node));
@@ -112,7 +110,7 @@ Uint64 VFS_MemFile_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buf
                Length = Node->Size - Offset;
        
        // Copy Data
-       memcpy(Buffer, Node->ImplPtr+Offset, Length);
+       memcpy(Buffer, (Uint8*)Node->ImplPtr + Offset, Length);
        
        return Length;
 }
@@ -134,7 +132,7 @@ Uint64 VFS_MemFile_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Bu
                Length = Node->Size - Offset;
        
        // Copy Data
-       memcpy(Node->ImplPtr+Offset, Buffer, Length);
+       memcpy((Uint8*)Node->ImplPtr + Offset, Buffer, Length);
        
        return Length;
 }