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

refactoring

See merge request teachos/kernel!38

1 files changed, 10 insertions, 10 deletions

diff --git a/kernel/kapi/filesystem.cpp b/kernel/kapi/filesystem.cpp
index 53a71be..db61c34 100644
--- a/kernel/kapi/filesystem.cpp
+++ b/kernel/kapi/filesystem.cpp
@@ -13,7 +13,7 @@
 
 namespace kapi::filesystem
 {
-  auto mount(std::string_view source, std::string_view target) -> int
+  auto mount(std::string_view source, std::string_view target) -> ssize_t
   {
     if (kernel::filesystem::vfs::get().do_mount(source, target) == kernel::filesystem::vfs::operation_result::success)
     {
@@ -22,7 +22,7 @@ namespace kapi::filesystem
     return -1;
   }
 
-  auto umount(std::string_view target) -> int
+  auto umount(std::string_view target) -> ssize_t
   {
     if (kernel::filesystem::vfs::get().unmount(target) == kernel::filesystem::vfs::operation_result::success)
     {
@@ -31,7 +31,7 @@ namespace kapi::filesystem
     return -1;
   }
 
-  auto open(std::string_view path) -> int
+  auto open(std::string_view path) -> ssize_t
   {
     if (auto dentry = kernel::filesystem::vfs::get().open(path))
     {
@@ -42,11 +42,11 @@ namespace kapi::filesystem
     return -1;
   }
 
-  auto close(int file_descriptor) -> int
+  auto close(size_t file_descriptor) -> ssize_t
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().get_file(file_descriptor))
+    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
     {
-      if (kernel::filesystem::vfs::get().close(open_file_descriptor->get_dentry()->get_absolute_path().view()) ==
+      if (kernel::filesystem::vfs::get().close(open_file_descriptor->get_dentry()->absolute_path().view()) ==
           kernel::filesystem::vfs::operation_result::success)
       {
         return kernel::filesystem::open_file_table::get().remove_file(file_descriptor);
@@ -55,9 +55,9 @@ namespace kapi::filesystem
     return -1;
   }
 
-  auto read(int file_descriptor, void * buffer, size_t size) -> ssize_t
+  auto read(size_t file_descriptor, void * buffer, size_t size) -> ssize_t
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().get_file(file_descriptor))
+    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
     {
       return open_file_descriptor->read(buffer, size);
     }
@@ -65,9 +65,9 @@ namespace kapi::filesystem
     return -1;
   }
 
-  auto write(int file_descriptor, void const * buffer, size_t size) -> ssize_t
+  auto write(size_t file_descriptor, void const * buffer, size_t size) -> ssize_t
   {
-    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().get_file(file_descriptor))
+    if (auto open_file_descriptor = kernel::filesystem::open_file_table::get().file(file_descriptor))
     {
       return open_file_descriptor->write(buffer, size);
     }