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

Refactor ssize_t

See merge request teachos/kernel!41

2 files changed, 5 insertions, 7 deletions

diff --git a/kernel/include/kernel/filesystem/ext2/filesystem.hpp b/kernel/include/kernel/filesystem/ext2/filesystem.hpp
index 45cd6a1..d5e5b8b 100644
--- a/kernel/include/kernel/filesystem/ext2/filesystem.hpp
+++ b/kernel/include/kernel/filesystem/ext2/filesystem.hpp
@@ -8,14 +8,12 @@
 #include <kernel/filesystem/inode.hpp>
 
 #include <kstd/memory>
+#include <kstd/unikstd.h>
 #include <kstd/vector>
 
 #include <cstddef>
 #include <cstdint>
 #include <string_view>
-#include <unistd.h>
-
-#include <sys/types.h>
 
 namespace kernel::filesystem::ext2
 {
@@ -85,7 +83,7 @@ namespace kernel::filesystem::ext2
     @return The global block number.
     */
     [[nodiscard]] auto map_inode_block_index_to_global_block_number(size_t inode_block_index, inode_data data) const
-        -> ssize_t;
+        -> kstd::ssize_t;
 
   private:
     [[nodiscard]] auto read_inode(uint32_t inode_number) const -> kstd::shared_ptr<kernel::filesystem::ext2::inode>;
diff --git a/kernel/include/kernel/filesystem/open_file_table.hpp b/kernel/include/kernel/filesystem/open_file_table.hpp
index 5794e4c..7e754ac 100644
--- a/kernel/include/kernel/filesystem/open_file_table.hpp
+++ b/kernel/include/kernel/filesystem/open_file_table.hpp
@@ -4,10 +4,10 @@
 #include <kernel/filesystem/open_file_descriptor.hpp>
 
 #include <kstd/memory>
+#include <kstd/unikstd.h>
 #include <kstd/vector>
 
 #include <cstddef>
-#include <unistd.h>
 
 namespace kernel::filesystem
 {
@@ -40,7 +40,7 @@ namespace kernel::filesystem
     @param fd The file descriptor to add.
     @return The file descriptor index assigned to the file, or -1 on failure.
     */
-    auto add_file(kstd::shared_ptr<open_file_descriptor> const & fd) -> ssize_t;
+    auto add_file(kstd::shared_ptr<open_file_descriptor> const & fd) -> kstd::ssize_t;
 
     /**
     @brief Get a file from the open file table.
@@ -54,7 +54,7 @@ namespace kernel::filesystem
     @param fd The file descriptor index to remove.
     @return 0 on success, or -1 on failure.
     */
-    auto remove_file(size_t fd) -> ssize_t;
+    auto remove_file(size_t fd) -> kstd::ssize_t;
 
   private:
     open_file_table() = default;