X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FFilesystems%2FInitRD%2Fmain.c;h=3ee61ac4f236189a1d3e93d609c6eb3da2beca79;hb=3d3ecebb9096fdb7f0bcc208a1a4e2894ee2a342;hp=b52ab8de2611e1fe7fec03ae6ad18bd31b5867a5;hpb=48743e39650eb1ef988380e9d95f27fd40d3a9ce;p=tpg%2Facess2.git diff --git a/KernelLand/Modules/Filesystems/InitRD/main.c b/KernelLand/Modules/Filesystems/InitRD/main.c index b52ab8de..3ee61ac4 100644 --- a/KernelLand/Modules/Filesystems/InitRD/main.c +++ b/KernelLand/Modules/Filesystems/InitRD/main.c @@ -5,7 +5,7 @@ #include "initrd.h" #include -#define DUMP_ON_MOUNT 1 +#define DUMP_ON_MOUNT 0 // === IMPORTS == extern tVFS_Node gInitRD_RootNode; @@ -17,7 +17,7 @@ extern tVFS_Node * const gInitRD_FileList[]; tVFS_Node *InitRD_InitDevice(const char *Device, const char **Arguments); void InitRD_Unmount(tVFS_Node *Node); tVFS_Node *InitRD_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode); -Uint64 InitRD_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Size, void *Buffer); +size_t InitRD_ReadFile(tVFS_Node *Node, off_t Offset, size_t Size, void *Buffer); char *InitRD_ReadDir(tVFS_Node *Node, int ID); tVFS_Node *InitRD_FindDir(tVFS_Node *Node, const char *Name); void InitRD_DumpDir(tVFS_Node *Node, int Indent); @@ -28,7 +28,7 @@ tVFS_Driver gInitRD_FSInfo = { "initrd", 0, InitRD_InitDevice, InitRD_Unmount, InitRD_GetNodeFromINode }; tVFS_NodeType gInitRD_DirType = { - .ReadDir = InitRD_ReadFile, + .ReadDir = InitRD_ReadDir, .FindDir = InitRD_FindDir }; tVFS_NodeType gInitRD_FileType = { @@ -76,7 +76,7 @@ tVFS_Node *InitRD_GetNodeFromINode(tVFS_Node *Root, Uint64 Inode) /** * \brief Read from a file */ -Uint64 InitRD_ReadFile(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer) +size_t InitRD_ReadFile(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer) { if(Offset > Node->Size) return 0;