Meta: Apply new clang-format rules to kernel

8 files changed, 19 insertions, 29 deletions

diff --git a/kernel/fs/devfs.c b/kernel/fs/devfs.c
index 7d880f6..c0ad7ce 100644
--- a/kernel/fs/devfs.c
+++ b/kernel/fs/devfs.c
@@ -8,11 +8,9 @@ devfs_file files[20];
 int num_files = 0;
 
 vfs_inode_t *devfs_add_file(
-    char *path,
-    int (*read)(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd),
+    char *path, int (*read)(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd),
     int (*write)(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd),
-    vfs_vm_object_t *(get_vm_object)(u64 length, u64 offset,
-                                     vfs_fd_t *fd),
+    vfs_vm_object_t *(get_vm_object)(u64 length, u64 offset, vfs_fd_t *fd),
     u8 has_data, u8 can_write, int type) {
   files[num_files].name = copy_and_allocate_string(path);
 
@@ -46,8 +44,7 @@ int devfs_write(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd) {
   return fd->inode->write(buffer, offset, len, fd);
 }
 
-vfs_vm_object_t *devfs_get_vm_object(u64 length, u64 offset,
-                                     vfs_fd_t *fd) {
+vfs_vm_object_t *devfs_get_vm_object(u64 length, u64 offset, vfs_fd_t *fd) {
   return fd->inode->get_vm_object(length, offset, fd);
 }
 
diff --git a/kernel/fs/devfs.h b/kernel/fs/devfs.h
index 9de7034..8ebadae 100644
--- a/kernel/fs/devfs.h
+++ b/kernel/fs/devfs.h
@@ -16,11 +16,9 @@ int devfs_write(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd);
 void add_stdout(void);
 void add_serial(void);
 vfs_inode_t *devfs_add_file(
-    char *path,
-    int (*read)(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd),
+    char *path, int (*read)(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd),
     int (*write)(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd),
-    vfs_vm_object_t *(*get_vm_object)(u64 length, u64 offset,
-                                      vfs_fd_t *fd),
+    vfs_vm_object_t *(*get_vm_object)(u64 length, u64 offset, vfs_fd_t *fd),
     u8 has_data, u8 can_write, int type);
 
 #endif
diff --git a/kernel/fs/fifo.c b/kernel/fs/fifo.c
index 5033717..4ae7c8a 100644
--- a/kernel/fs/fifo.c
+++ b/kernel/fs/fifo.c
@@ -9,8 +9,7 @@ void fifo_close(vfs_fd_t *fd) {
   return;
 }
 
-int fifo_object_write(u8 *buffer, u64 offset, u64 len,
-                      FIFO_FILE *file) {
+int fifo_object_write(u8 *buffer, u64 offset, u64 len, FIFO_FILE *file) {
   (void)offset;
   file->has_data = 1;
   if (file->write_len + len >= file->buffer_len) {
@@ -22,8 +21,7 @@ int fifo_object_write(u8 *buffer, u64 offset, u64 len,
   return len;
 }
 
-int fifo_object_read(u8 *buffer, u64 offset, u64 len,
-                     FIFO_FILE *file) {
+int fifo_object_read(u8 *buffer, u64 offset, u64 len, FIFO_FILE *file) {
   (void)offset;
   if (file->write_len == 0) {
     file->has_data = 0;
diff --git a/kernel/fs/fifo.h b/kernel/fs/fifo.h
index e504c9a..456b85d 100644
--- a/kernel/fs/fifo.h
+++ b/kernel/fs/fifo.h
@@ -16,12 +16,8 @@ struct S_FIFO_FILE {
 
 int create_fifo(void);
 FIFO_FILE *create_fifo_object(void);
-int fifo_object_write(u8 *buffer, u64 offset, u64 len,
-                      FIFO_FILE *file);
-int fifo_object_read(u8 *buffer, u64 offset, u64 len,
-                     FIFO_FILE *file);
-int fifo_write(u8 *buffer, u64 offset, u64 len,
-               vfs_fd_t *fd);
-int fifo_read(u8 *buffer, u64 offset, u64 len,
-              vfs_fd_t *fd);
+int fifo_object_write(u8 *buffer, u64 offset, u64 len, FIFO_FILE *file);
+int fifo_object_read(u8 *buffer, u64 offset, u64 len, FIFO_FILE *file);
+int fifo_write(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd);
+int fifo_read(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd);
 #endif
diff --git a/kernel/fs/shm.c b/kernel/fs/shm.c
index 2224cc2..5eb7f23 100644
--- a/kernel/fs/shm.c
+++ b/kernel/fs/shm.c
@@ -9,7 +9,9 @@
 
 HashMap *shared_memory_objects;
 
-void shm_init(void) { shared_memory_objects = hashmap_create(10); }
+void shm_init(void) {
+  shared_memory_objects = hashmap_create(10);
+}
 
 int shm_write(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd) {
   vfs_vm_object_t *p = fd->inode->internal_object;
@@ -39,8 +41,7 @@ int shm_read(u8 *buffer, u64 offset, u64 len, vfs_fd_t *fd) {
   return len;
 }
 
-vfs_vm_object_t *shm_get_vm_object(u64 length, u64 offset,
-                                   vfs_fd_t *fd) {
+vfs_vm_object_t *shm_get_vm_object(u64 length, u64 offset, vfs_fd_t *fd) {
   (void)length;
   (void)offset;
   vfs_vm_object_t *p = fd->inode->internal_object;
@@ -81,7 +82,7 @@ int shm_open(const char *name, int oflag, mode_t mode) {
       NULL /*stat*/);
 
   vfs_fd_t *fd_ptr;
-  int fd = vfs_create_fd(oflag, mode, 0/*is_tty*/, inode, &fd_ptr);
+  int fd = vfs_create_fd(oflag, mode, 0 /*is_tty*/, inode, &fd_ptr);
   if (-1 == fd) {
     kfree(inode);
     return -EMFILE;
diff --git a/kernel/fs/shm.h b/kernel/fs/shm.h
index 2a184dd..2cd7f58 100644
--- a/kernel/fs/shm.h
+++ b/kernel/fs/shm.h
@@ -1,8 +1,8 @@
 #ifndef SHM_H
 #define SHM_H
 #include <stddef.h>
-#include <typedefs.h>
 #include <sys/types.h>
+#include <typedefs.h>
 
 void shm_init(void);
 int shm_open(const char *name, int oflag, mode_t mode);
diff --git a/kernel/fs/tmpfs.c b/kernel/fs/tmpfs.c
index d213005..b9f7b7e 100644
--- a/kernel/fs/tmpfs.c
+++ b/kernel/fs/tmpfs.c
@@ -52,7 +52,7 @@ void dual_pipe(int fd[2]) {
     assert(inode);
 
     vfs_fd_t *fd_ptr;
-    fd[i] = vfs_create_fd(O_RDWR | O_NONBLOCK, 0, 0/*is_tty*/, inode, &fd_ptr);
+    fd[i] = vfs_create_fd(O_RDWR | O_NONBLOCK, 0, 0 /*is_tty*/, inode, &fd_ptr);
     assert(-1 != fd[i]);
   }
   vfs_inode_t *f_inode = get_current_task()->file_descriptors[fd[0]]->inode;
diff --git a/kernel/fs/vfs.h b/kernel/fs/vfs.h
index d042acf..77d9efd 100644
--- a/kernel/fs/vfs.h
+++ b/kernel/fs/vfs.h
@@ -4,13 +4,13 @@ typedef struct vfs_vm_object vfs_vm_object_t;
 typedef struct vfs_mounts vfs_mounts_t;
 #ifndef VFS_H
 #define VFS_H
+#include <dirent.h>
 #include <limits.h>
 #include <sched/scheduler.h>
 #include <socket.h>
 #include <stddef.h>
 #include <sys/stat.h>
 #include <typedefs.h>
-#include <dirent.h>
 
 // FIXME: Is there some standard value for this?
 #define O_NONBLOCK (1 << 0)