X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Fmemfile.c;h=c197626ff4e85aac6b95d3c627245d89fba07d0b;hb=9d85201216cb35e1b1e051b1d7cdc38eaa5befa4;hp=4120b20a32d0d0db4724336b362da06c2474dbe2;hpb=a4ce2e60f783c9e71447edc03f20f937b8abf35a;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/memfile.c b/Kernel/vfs/memfile.c
index 4120b20a..c197626f 100644
--- 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;
 }