diff options
| author | Lukas Oesch <lukas.oesch@ost.ch> | 2026-05-25 10:20:06 +0200 |
|---|---|---|
| committer | Lukas Oesch <lukas.oesch@ost.ch> | 2026-05-25 10:20:06 +0200 |
| commit | 093074d5209f2d0062be79059f5881ee051c07d0 (patch) | |
| tree | 2adb26cb757e5eeb8d2e6f1ce7ed7d631088f55d /kernel/src/filesystem | |
| parent | 1279dddbf400828cbadb1b3774fb060d18d8251c (diff) | |
| parent | 2063d3e165a1b92a46c73badf56927228ed4d5e8 (diff) | |
| download | kernel-093074d5209f2d0062be79059f5881ee051c07d0.tar.xz kernel-093074d5209f2d0062be79059f5881ee051c07d0.zip | |
Merge branch 'ssize_t-refactoring' into 'develop-BA-FS26'
Refactor ssize_t
See merge request teachos/kernel!41
Diffstat (limited to 'kernel/src/filesystem')
| -rw-r--r-- | kernel/src/filesystem/ext2/filesystem.cpp | 4 | ||||
| -rw-r--r-- | kernel/src/filesystem/open_file_table.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kernel/src/filesystem/ext2/filesystem.cpp b/kernel/src/filesystem/ext2/filesystem.cpp index df5b4c4..a30149e 100644 --- a/kernel/src/filesystem/ext2/filesystem.cpp +++ b/kernel/src/filesystem/ext2/filesystem.cpp @@ -8,12 +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> namespace kernel::filesystem::ext2 { @@ -110,7 +110,7 @@ namespace kernel::filesystem::ext2 } auto filesystem::map_inode_block_index_to_global_block_number(size_t inode_block_index, inode_data data) const - -> ssize_t + -> kstd::ssize_t { if (inode_block_index < constants::direct_block_count) { diff --git a/kernel/src/filesystem/open_file_table.cpp b/kernel/src/filesystem/open_file_table.cpp index 4d52d36..2afe3aa 100644 --- a/kernel/src/filesystem/open_file_table.cpp +++ b/kernel/src/filesystem/open_file_table.cpp @@ -5,11 +5,11 @@ #include <kapi/system.hpp> #include <kstd/memory> +#include <kstd/unikstd.h> #include <algorithm> #include <cstddef> #include <optional> -#include <unistd.h> namespace { @@ -38,7 +38,7 @@ namespace kernel::filesystem return *global_open_file_table; } - auto open_file_table::add_file(kstd::shared_ptr<open_file_descriptor> const & file_descriptor) -> ssize_t + auto open_file_table::add_file(kstd::shared_ptr<open_file_descriptor> const & file_descriptor) -> kstd::ssize_t { if (!file_descriptor) { @@ -66,7 +66,7 @@ namespace kernel::filesystem return m_open_files.at(fd); } - auto open_file_table::remove_file(size_t fd) -> ssize_t + auto open_file_table::remove_file(size_t fd) -> kstd::ssize_t { if (fd >= m_open_files.size()) { |