From d94ffac4a584dc7a4f6f2ec567b8caab05ce9253 Mon Sep 17 00:00:00 2001 From: Marvin Borner Date: Wed, 6 May 2020 19:04:05 +0200 Subject: New build parameters and shared includes This changes many files but I've just applied some replace commands.. So - nothing special! --- src/kernel/fs/fs.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/kernel/fs/fs.c') diff --git a/src/kernel/fs/fs.c b/src/kernel/fs/fs.c index 1553113..a57a83e 100644 --- a/src/kernel/fs/fs.c +++ b/src/kernel/fs/fs.c @@ -1,11 +1,11 @@ #include -#include -#include -#include +#include +#include +#include -uint32_t get_file_size(char *path) +u32 get_file_size(char *path) { - uint32_t inode = ext2_look_up_path(path); + u32 inode = ext2_look_up_path(path); struct ext2_file file; ext2_open_inode(inode, &file); if (inode != 0) { @@ -17,9 +17,9 @@ uint32_t get_file_size(char *path) } // TODO: Implement offset -uint32_t read(char *path, uint32_t offset, uint32_t count, uint8_t *buf) +u32 read(char *path, u32 offset, u32 count, u8 *buf) { - uint32_t inode = ext2_look_up_path(path); + u32 inode = ext2_look_up_path(path); struct ext2_file file; ext2_open_inode(inode, &file); if (inode != 0) { @@ -35,21 +35,21 @@ uint32_t read(char *path, uint32_t offset, uint32_t count, uint8_t *buf) } // TODO: Implement writing -uint32_t write(char *path, uint32_t offset, uint32_t count, uint8_t *buf) +u32 write(char *path, u32 offset, u32 count, u8 *buf) { warn("Writing is not supported!"); return -1; } -uint8_t *read_file(char *path) +u8 *read_file(char *path) { - uint32_t inode = ext2_look_up_path(path); + u32 inode = ext2_look_up_path(path); struct ext2_file file; ext2_open_inode(inode, &file); if (inode != 0) { - size_t size = file.inode.size; + u32 size = file.inode.size; debug("Reading %s: %dKiB", path, size >> 10); - uint8_t *buf = kmalloc(size); + u8 *buf = kmalloc(size); ext2_read(&file, buf, size); kfree(file.buf); buf[size - 1] = '\0'; -- cgit v1.2.3