diff options
| author | Amlal <amlalelmahrouss@icloud.com> | 2024-12-22 12:12:51 +0100 |
|---|---|---|
| committer | Amlal <amlalelmahrouss@icloud.com> | 2024-12-22 12:12:51 +0100 |
| commit | d78bd7257f380888e9900f6357e6ec280240d451 (patch) | |
| tree | 8212730cfdbfda64206275b8f825ed65c35200da /dev | |
| parent | 81183c95e955a416a5b401b05a903945687b1fad (diff) | |
IMPL: Refactor class for #3.
Signed-off-by: Amlal <amlalelmahrouss@icloud.com>
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/Kernel/FSKit/NeFS.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/FileMgr.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/KernelMain.cc | 26 |
3 files changed, 10 insertions, 20 deletions
diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h index c80bc1c7..5c62f0c2 100644 --- a/dev/Kernel/FSKit/NeFS.h +++ b/dev/Kernel/FSKit/NeFS.h @@ -323,7 +323,7 @@ namespace Kernel NFS_CATALOG_STRUCT* mNode{nullptr}; public: - explicit NeFileSystemJournal(const char* stamp = "/System" kNeFSJournalExt) + explicit NeFileSystemJournal(const char* stamp = nullptr) { if (!stamp) { diff --git a/dev/Kernel/src/FileMgr.cc b/dev/Kernel/src/FileMgr.cc index 20892c99..c748e721 100644 --- a/dev/Kernel/src/FileMgr.cc +++ b/dev/Kernel/src/FileMgr.cc @@ -28,7 +28,7 @@ namespace Kernel if (kMountedFilesystem) { auto mount = kMountedFilesystem; - kMountedFilesystem = nullptr; + kMountedFilesystem = nullptr; return mount; } diff --git a/dev/Kernel/src/KernelMain.cc b/dev/Kernel/src/KernelMain.cc index 8895814d..556ab5e2 100644 --- a/dev/Kernel/src/KernelMain.cc +++ b/dev/Kernel/src/KernelMain.cc @@ -34,18 +34,18 @@ namespace Kernel::Detail /// @brief Filesystem auto formatter, additional checks are also done by the class. class NeFilesystemInstaller final { - Kernel::NeFileSystemMgr* mNeFS{nullptr}; + Kernel::NeFileSystemParser* mNeFS{nullptr}; Kernel::NeFileSystemJournal mJournal; public: /// @brief wizard constructor. explicit NeFilesystemInstaller() { - mNeFS = new Kernel::NeFileSystemMgr(); + mNeFS = new Kernel::NeFileSystemParser(); if (mNeFS) { - mJournal.CreateJournal(mNeFS->GetParser()); + mJournal.CreateJournal(mNeFS); constexpr auto kFolderInfo = "META-XML"; const SizeT kFolderCount = 7; @@ -55,7 +55,7 @@ namespace Kernel::Detail for (Kernel::SizeT dir_index = 0UL; dir_index < kFolderCount; ++dir_index) { - auto catalog_folder = mNeFS->GetParser()->GetCatalog(kFolderStr[dir_index]); + auto catalog_folder = mNeFS->GetCatalog(kFolderStr[dir_index]); if (catalog_folder) { @@ -65,7 +65,7 @@ namespace Kernel::Detail continue; } - catalog_folder = mNeFS->GetParser()->CreateCatalog(kFolderStr[dir_index], 0, + catalog_folder = mNeFS->CreateCatalog(kFolderStr[dir_index], 0, kNeFSCatalogKindDir); NFS_FORK_STRUCT fork_folder{0}; @@ -95,13 +95,13 @@ namespace Kernel::Detail Kernel::KString folder_name(2048); folder_name += catalog_folder->Name; - mJournal.Commit(mNeFS->GetParser(), folder_metadata,folder_name); + mJournal.Commit(mNeFS, folder_metadata,folder_name); const Kernel::SizeT kMetaDataSz = kNeFSSectorSz; - mNeFS->GetParser()->CreateFork(catalog_folder, fork_folder); + mNeFS->CreateFork(catalog_folder, fork_folder); - mNeFS->GetParser()->WriteCatalog( + mNeFS->WriteCatalog( catalog_folder, true, (Kernel::VoidPtr)(folder_metadata.CData()), kMetaDataSz, kFolderInfo); @@ -109,8 +109,6 @@ namespace Kernel::Detail catalog_folder = nullptr; } } - - while (1); } ~NeFilesystemInstaller() @@ -122,14 +120,6 @@ namespace Kernel::Detail } ZKA_COPY_DEFAULT(NeFilesystemInstaller); - - /// @brief Grab the disk's NewFS reference. - /// @return NeFileSystemMgr the filesystem interface - Kernel::NeFileSystemMgr* Leak() noexcept - { - MUST_PASS(mNeFS); - return mNeFS; - } }; } // namespace Kernel::Detail |