diff options
| -rw-r--r-- | Kernel/KernelKit/FileManager.hpp | 10 | ||||
| -rw-r--r-- | Kernel/KernelKit/SMPManager.hpp | 2 | ||||
| -rw-r--r-- | Kernel/KernelKit/XCOFF.hxx | 6 | ||||
| -rw-r--r-- | Kernel/Sources/FileManager.cxx | 24 |
4 files changed, 23 insertions, 19 deletions
diff --git a/Kernel/KernelKit/FileManager.hpp b/Kernel/KernelKit/FileManager.hpp index a687b301..8bbbaaaa 100644 --- a/Kernel/KernelKit/FileManager.hpp +++ b/Kernel/KernelKit/FileManager.hpp @@ -136,13 +136,13 @@ namespace NewOS NEWOS_COPY_DEFAULT(NewFilesystemManager); public: - NodePtr Create(const char* path) override; - NodePtr CreateAlias(const char* path) override; - NodePtr CreateDirectory(const char* path) override; + NodePtr Create(const Char* path) override; + NodePtr CreateAlias(const Char* path) override; + NodePtr CreateDirectory(const Char* path) override; public: - bool Remove(const char* path) override; - NodePtr Open(const char* path, const char* r) override; + bool Remove(const Char* path) override; + NodePtr Open(const Char* path, const Char* r) override; Void Write(NodePtr node, VoidPtr data, Int32 flags, SizeT sz) override; VoidPtr Read(NodePtr node, Int32 flags, SizeT sz) override; bool Seek(NodePtr node, SizeT off); diff --git a/Kernel/KernelKit/SMPManager.hpp b/Kernel/KernelKit/SMPManager.hpp index 9f4166ad..324358dc 100644 --- a/Kernel/KernelKit/SMPManager.hpp +++ b/Kernel/KernelKit/SMPManager.hpp @@ -89,8 +89,6 @@ namespace NewOS public: ~SMPManager(); - - public: NEWOS_COPY_DEFAULT(SMPManager); public: diff --git a/Kernel/KernelKit/XCOFF.hxx b/Kernel/KernelKit/XCOFF.hxx index 0d74b3ef..fbcfa5e7 100644 --- a/Kernel/KernelKit/XCOFF.hxx +++ b/Kernel/KernelKit/XCOFF.hxx @@ -11,8 +11,8 @@ ------------------------------------------- */ -#ifndef __XCOFF__ -#define __XCOFF__ +#ifndef __INC_XCOFF_HXX__ +#define __INC_XCOFF_HXX__ #include <NewKit/Defines.hpp> @@ -48,4 +48,4 @@ typedef struct XCoffForkHeader NewOS::Char fCodeSignFork[cForkNameLen]; } XCoffForkHeader; -#endif // ifndef __XCOFF__ +#endif // ifndef __INC_XCOFF_HXX__ diff --git a/Kernel/Sources/FileManager.cxx b/Kernel/Sources/FileManager.cxx index 2c0bd366..11830252 100644 --- a/Kernel/Sources/FileManager.cxx +++ b/Kernel/Sources/FileManager.cxx @@ -23,7 +23,7 @@ namespace NewOS /// @brief Unmount filesystem. /// @return The unmounted filesystem. - FilesystemManagerInterface* FilesystemManagerInterface::Unmount() + _Output FilesystemManagerInterface* FilesystemManagerInterface::Unmount() { if (kMounted) { @@ -39,7 +39,7 @@ namespace NewOS /// @brief Mount filesystem. /// @param mountPtr The filesystem to mount. /// @return if it succeeded true, otherwise false. - bool FilesystemManagerInterface::Mount(FilesystemManagerInterface* mountPtr) + bool FilesystemManagerInterface::Mount(_Input FilesystemManagerInterface* mountPtr) { if (kMounted == nullptr) { @@ -55,7 +55,7 @@ namespace NewOS /// @param path /// @param r /// @return - NodePtr NewFilesystemManager::Open(const char* path, const char* r) + NodePtr NewFilesystemManager::Open(_Input const Char* path, _Input const Char* r) { if (!path || *path == 0) return nullptr; @@ -79,10 +79,13 @@ namespace NewOS /// @param data the data. /// @param flags the size. /// @return - Void NewFilesystemManager::Write(NodePtr node, VoidPtr data, Int32 flags, SizeT size) + Void NewFilesystemManager::Write(_Input NodePtr node, _Input VoidPtr data, _Input Int32 flags, _Input SizeT size) { - auto dataForkName = kNewFSDataFork; - this->Write(dataForkName, node, data, flags, size); + if (!node) return; + if (!size) return; + + constexpr auto cDataForkName = kNewFSDataFork; + this->Write(cDataForkName, node, data, flags, size); } /// @brief Read from filesystem fork. @@ -90,10 +93,13 @@ namespace NewOS /// @param flags the flags with it. /// @param sz the size to read. /// @return - VoidPtr NewFilesystemManager::Read(NodePtr node, Int32 flags, SizeT sz) + VoidPtr NewFilesystemManager::Read(_Input NodePtr node, _Input Int32 flags, _Input SizeT size) { - auto dataForkName = kNewFSDataFork; - return this->Read(dataForkName, node, flags, sz); + if (!node) return nullptr; + if (!size) return nullptr; + + constexpr auto cDataForkName = kNewFSDataFork; + return this->Read(cDataForkName, node, flags, size); } Void NewFilesystemManager::Write(_Input const Char* name, |