Major coding style reformatting -> Kernighan & Ritchie

This project now (hopefully) uses the same style recommended by Kernighan and Ritchie and used in the Linux Kernel

1 files changed, 22 insertions, 18 deletions

diff --git a/src/kernel/fs/marfs/read_whole_file.c b/src/kernel/fs/marfs/read_whole_file.c
index 0d3af26..324cd9b 100644
--- a/src/kernel/fs/marfs/read_whole_file.c
+++ b/src/kernel/fs/marfs/read_whole_file.c
@@ -3,28 +3,30 @@
 #include <mlibc/stdlib.h>
 #include <kernel/fs/marfs/marfs.h>
 
-static uint8_t last_maxlevel = 0;
+static uint8_t last_max_level = 0;
 
-uint32_t marfs_get_recursive(uint8_t level, uint32_t i, uint32_t recLBA) {
-    if (level > last_maxlevel) last_maxlevel = level;
-    uint32_t *contents = (uint32_t *) ATA_read28(iface, recLBA);
+uint32_t marfs_get_recursive(uint8_t level, uint32_t i, uint32_t rec_lba)
+{
+    if (level > last_max_level) last_max_level = level;
+    uint32_t *contents = (uint32_t *) ata_read28(interface, rec_lba);
     uint32_t idx = i - 10;
-    if (last_maxlevel > 1) idx -= 1 << 7;
-    if (last_maxlevel > 2) idx -= 1 << (7 * 2);
-    if (last_maxlevel > 3) idx -= 1 << (7 * 3);
+    if (last_max_level > 1) idx -= 1 << 7;
+    if (last_max_level > 2) idx -= 1 << (7 * 2);
+    if (last_max_level > 3) idx -= 1 << (7 * 3);
     idx >>= 7 * (level - 1);
 
-    uint32_t next_recLBA = contents[idx];
+    uint32_t next_rec_lba = contents[idx];
     kfree(contents);
 
     uint32_t toRet;
-    if (level > 1) toRet = marfs_get_recursive(level - 1, i, next_recLBA);
-    else toRet = next_recLBA;
-    last_maxlevel = 0;
+    if (level > 1) toRet = marfs_get_recursive(level - 1, i, next_rec_lba);
+    else toRet = next_rec_lba;
+    last_max_level = 0;
     return toRet;
 }
 
-uint32_t marfs_get_block(struct marfs_INODE *inode, uint32_t i) {
+uint32_t marfs_get_block(struct marfs_inode *inode, uint32_t i)
+{
     if (i > 9 + (128 * 128 * 128)) {
         return marfs_get_recursive(4, i, inode->ext_4);
     } else if (i > 9 + (128 * 128)) {
@@ -38,13 +40,14 @@ uint32_t marfs_get_block(struct marfs_INODE *inode, uint32_t i) {
     }
 }
 
-void marfs_read_whole_file(uint32_t LBAinode, uint8_t *buffer) {
-    struct marfs_INODE *inode = (struct marfs_INODE *) ATA_read28(iface, LBAinode);
+void marfs_read_whole_file(uint32_t lba_inode, uint8_t *buffer)
+{
+    struct marfs_inode *inode = (struct marfs_inode *) ata_read28(interface, lba_inode);
 
     uint32_t size_in_blocks = inode->n_blocks;
     for (uint32_t i = 0; i < size_in_blocks; i++) {
         uint32_t this_block = marfs_get_block(inode, i);
-        uint8_t *this_block_contents = ATA_read28(iface, this_block);
+        uint8_t *this_block_contents = ata_read28(interface, this_block);
         uint16_t upper_bound = (i != size_in_blocks - 1) ? 512 : (inode->size % 512);
         for (uint16_t j = 0; j < upper_bound; j++) buffer[(i * 512) + j] = this_block_contents[j];
         kfree(this_block_contents);
@@ -54,12 +57,13 @@ void marfs_read_whole_file(uint32_t LBAinode, uint8_t *buffer) {
 }
 
 // TODO: Beautify
-uint8_t *marfs_allocate_and_read_whole_file(uint32_t LBAinode) {
-    struct marfs_INODE *inode = (struct marfs_INODE *) ATA_read28(iface, LBAinode);
+uint8_t *marfs_allocate_and_read_whole_file(uint32_t lba_inode)
+{
+    struct marfs_inode *inode = (struct marfs_inode *) ata_read28(interface, lba_inode);
     uint64_t size = inode->size;
     kfree(inode);
 
     uint8_t *buffer = kmalloc(size);
-    marfs_read_whole_file(LBAinode, buffer);
+    marfs_read_whole_file(lba_inode, buffer);
     return buffer;
 }