Merge branch 'refactoring' into 'develop-BA-FS26'

Refactoring

See merge request teachos/kernel!27

1 files changed, 12 insertions, 12 deletions

diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index c8d4c6d..4c68f28 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -1,7 +1,7 @@
 #include <kapi/filesystem.hpp>
 
-#include <kernel/filesystem/file_descriptor_table.hpp>
-#include <kernel/filesystem/open_file_description.hpp>
+#include <kernel/filesystem/open_file_descriptor.hpp>
+#include <kernel/filesystem/open_file_table.hpp>
 #include <kernel/filesystem/vfs.hpp>
 
 #include <kstd/memory>
@@ -35,33 +35,33 @@ namespace kapi::filesystem
   {
     if (auto dentry = kernel::filesystem::vfs::get().open(path))
     {
-      auto open_file_description = kstd::make_shared<kernel::filesystem::open_file_description>(dentry->get_inode());
-      return kernel::filesystem::file_descriptor_table::get().add_file(open_file_description);
+      auto open_file_descriptor = kstd::make_shared<kernel::filesystem::open_file_descriptor>(dentry->get_inode());
+      return kernel::filesystem::open_file_table::get().add_file(open_file_descriptor);
     }
 
     return -1;
   }
 
-  auto close(int fd) -> int
+  auto close(int file_descriptor) -> int
   {
-    return kernel::filesystem::file_descriptor_table::get().remove_file(fd);
+    return kernel::filesystem::open_file_table::get().remove_file(file_descriptor);
   }
 
-  auto read(int fd, void * buffer, size_t size) -> ssize_t
+  auto read(int file_descriptor, void * buffer, size_t size) -> ssize_t
   {
-    if (auto open_file_description = kernel::filesystem::file_descriptor_table::get().get_file(fd))
+    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().get_file(file_descriptor))
     {
-      return open_file_description->read(buffer, size);
+      return open_file_descriptor->read(buffer, size);
     }
 
     return -1;
   }
 
-  auto write(int fd, void const * buffer, size_t size) -> ssize_t
+  auto write(int file_descriptor, void const * buffer, size_t size) -> ssize_t
   {
-    if (auto open_file_description = kernel::filesystem::file_descriptor_table::get().get_file(fd))
+    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().get_file(file_descriptor))
     {
-      return open_file_description->write(buffer, size);
+      return open_file_descriptor->write(buffer, size);
     }
 
     return -1;