X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fvfs%2Ffs%2Froot.c;h=4c3c6a2770c9f8af8421bf371bea2606f22f5449;hb=54bf151b1a05b74debdb5f3baec02c18406b74d1;hp=c52313de238e8da9a5b1994fd566a4b0b97822ca;hpb=dea6bcf35a3f52396724d74e47f71cb3afade37c;p=tpg%2Facess2.git

diff --git a/Kernel/vfs/fs/root.c b/Kernel/vfs/fs/root.c
index c52313de..4c3c6a27 100644
--- a/Kernel/vfs/fs/root.c
+++ b/Kernel/vfs/fs/root.c
@@ -10,9 +10,9 @@
 #define MAX_FILES	64
 
 // === PROTOTYPES ===
-tVFS_Node	*Root_InitDevice(char *Device, char **Options);
- int	Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags);
-tVFS_Node	*Root_FindDir(tVFS_Node *Node, char *Name);
+tVFS_Node	*Root_InitDevice(const char *Device, const char **Options);
+ int	Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags);
+tVFS_Node	*Root_FindDir(tVFS_Node *Node, const char *Name);
 char	*Root_ReadDir(tVFS_Node *Node, int Pos);
 Uint64	Root_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
 Uint64	Root_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer);
@@ -20,11 +20,8 @@ tRamFS_File	*Root_int_AllocFile(void);
 
 // === GLOBALS ===
 tVFS_Driver	gRootFS_Info = {
-	"rootfs", 0,
-	Root_InitDevice,
-	NULL,	// Unmount
-	NULL
-};
+	"rootfs", 0, Root_InitDevice, NULL, NULL
+	};
 tRamFS_File	RootFS_Files[MAX_FILES];
 tVFS_ACL	RootFS_DirACLs[3] = {
 	{{0,0}, {0,VFS_PERM_ALL}},	// Owner (Root)
@@ -39,10 +36,9 @@ tVFS_ACL	RootFS_FileACLs[3] = {
 
 // === CODE ===
 /**
- * \fn tVFS_Node *Root_InitDevice(char *Device, char **Options)
  * \brief Initialise the root filesystem
  */
-tVFS_Node *Root_InitDevice(char *Device, char **Options)
+tVFS_Node *Root_InitDevice(const char *Device, const char **Options)
 {
 	tRamFS_File	*root;
 	if(strcmp(Device, "root") != 0) {
@@ -70,10 +66,10 @@ tVFS_Node *Root_InitDevice(char *Device, char **Options)
 }
 
 /**
- * \fn int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags)
+ * \fn int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
  * \brief Create an entry in the root directory
  */
-int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags)
+int Root_MkNod(tVFS_Node *Node, const char *Name, Uint Flags)
 {
 	tRamFS_File	*parent = Node->ImplPtr;
 	tRamFS_File	*child = parent->Data.FirstChild;
@@ -129,10 +125,10 @@ int Root_MkNod(tVFS_Node *Node, char *Name, Uint Flags)
 }
 
 /**
- * \fn tVFS_Node *Root_FindDir(tVFS_Node *Node, char *Name)
+ * \fn tVFS_Node *Root_FindDir(tVFS_Node *Node, const char *Name)
  * \brief Find an entry in the filesystem
  */
-tVFS_Node *Root_FindDir(tVFS_Node *Node, char *Name)
+tVFS_Node *Root_FindDir(tVFS_Node *Node, const char *Name)
 {
 	tRamFS_File	*parent = Node->ImplPtr;
 	tRamFS_File	*child = parent->Data.FirstChild;
@@ -159,7 +155,7 @@ char *Root_ReadDir(tVFS_Node *Node, int Pos)
 	
 	for( ; child && Pos--; child = child->Next ) ;
 	
-	if(Pos)	return strdup(child->Name);
+	if(child)	return strdup(child->Name);
 	
 	return NULL;
 }