diff --git a/Kernel/FileSystem/SysFS.cpp b/Kernel/FileSystem/SysFS.cpp index d737f7f2d8..cc16af1782 100644 --- a/Kernel/FileSystem/SysFS.cpp +++ b/Kernel/FileSystem/SysFS.cpp @@ -5,7 +5,6 @@ */ #include -#include #include #include #include @@ -85,12 +84,12 @@ NonnullRefPtr SysFS::root_inode() const return *m_root_inode; } -NonnullRefPtr SysFSInode::create(const SysFS& fs, const SystemExposedComponent& component) +NonnullRefPtr SysFSInode::create(SysFS const& fs, SystemExposedComponent const& component) { return adopt_ref(*new (nothrow) SysFSInode(fs, component)); } -SysFSInode::SysFSInode(const SysFS& fs, const SystemExposedComponent& component) +SysFSInode::SysFSInode(SysFS const& fs, SystemExposedComponent const& component) : Inode(const_cast(fs), component.component_index()) , m_associated_component(component) { @@ -128,22 +127,22 @@ void SysFSInode::flush_metadata() { } -KResultOr SysFSInode::write_bytes(off_t offset, size_t count, const UserOrKernelBuffer& buffer, FileDescription* fd) +KResultOr SysFSInode::write_bytes(off_t offset, size_t count, UserOrKernelBuffer const& buffer, FileDescription* fd) { return m_associated_component->write_bytes(offset, count, buffer, fd); } -KResultOr> SysFSInode::create_child(const String&, mode_t, dev_t, uid_t, gid_t) +KResultOr> SysFSInode::create_child(String const&, mode_t, dev_t, uid_t, gid_t) { return EROFS; } -KResult SysFSInode::add_child(Inode&, const StringView&, mode_t) +KResult SysFSInode::add_child(Inode&, StringView const&, mode_t) { return EROFS; } -KResult SysFSInode::remove_child(const StringView&) +KResult SysFSInode::remove_child(StringView const&) { return EROFS; } @@ -168,12 +167,12 @@ KResult SysFSInode::truncate(u64) return EPERM; } -NonnullRefPtr SysFSDirectoryInode::create(const SysFS& sysfs, const SystemExposedComponent& component) +NonnullRefPtr SysFSDirectoryInode::create(SysFS const& sysfs, SystemExposedComponent const& component) { return adopt_ref(*new (nothrow) SysFSDirectoryInode(sysfs, component)); } -SysFSDirectoryInode::SysFSDirectoryInode(const SysFS& fs, const SystemExposedComponent& component) +SysFSDirectoryInode::SysFSDirectoryInode(SysFS const& fs, SystemExposedComponent const& component) : SysFSInode(fs, component) , m_parent_fs(const_cast(fs)) { diff --git a/Kernel/FileSystem/SysFS.h b/Kernel/FileSystem/SysFS.h index 68779256cd..7fe8a82806 100644 --- a/Kernel/FileSystem/SysFS.h +++ b/Kernel/FileSystem/SysFS.h @@ -62,7 +62,7 @@ public: static NonnullRefPtr create(); virtual bool initialize() override; - virtual const char* class_name() const override { return "SysFS"; } + virtual char const* class_name() const override { return "SysFS"; } virtual NonnullRefPtr root_inode() const override; @@ -77,20 +77,20 @@ class SysFSInode : public Inode { friend class SysFSDirectoryInode; public: - static NonnullRefPtr create(const SysFS&, const SystemExposedComponent&); + static NonnullRefPtr create(SysFS const&, SystemExposedComponent const&); StringView name() const { return m_associated_component->name(); } protected: - SysFSInode(const SysFS&, const SystemExposedComponent&); + SysFSInode(SysFS const&, SystemExposedComponent const&); virtual KResultOr read_bytes(off_t, size_t, UserOrKernelBuffer& buffer, FileDescription*) const override; virtual KResult traverse_as_directory(Function) const override; virtual RefPtr lookup(StringView name) override; virtual void flush_metadata() override; virtual InodeMetadata metadata() const override; - virtual KResultOr write_bytes(off_t, size_t, const UserOrKernelBuffer& buffer, FileDescription*) override; - virtual KResultOr> create_child(const String& name, mode_t, dev_t, uid_t, gid_t) override; - virtual KResult add_child(Inode&, const StringView& name, mode_t) override; - virtual KResult remove_child(const StringView& name) override; + virtual KResultOr write_bytes(off_t, size_t, UserOrKernelBuffer const&, FileDescription*) override; + virtual KResultOr> create_child(String const& name, mode_t, dev_t, uid_t, gid_t) override; + virtual KResult add_child(Inode&, StringView const& name, mode_t) override; + virtual KResult remove_child(StringView const& name) override; virtual KResultOr directory_entry_count() const override; virtual KResult chmod(mode_t) override; virtual KResult chown(uid_t, gid_t) override; @@ -104,11 +104,11 @@ class SysFSDirectoryInode : public SysFSInode { friend class SysFSRootDirectoryInode; public: - static NonnullRefPtr create(const SysFS&, const SystemExposedComponent&); + static NonnullRefPtr create(SysFS const&, SystemExposedComponent const&); virtual ~SysFSDirectoryInode() override; protected: - SysFSDirectoryInode(const SysFS&, const SystemExposedComponent&); + SysFSDirectoryInode(SysFS const&, SystemExposedComponent const&); // ^Inode virtual InodeMetadata metadata() const override; virtual KResult traverse_as_directory(Function) const override; diff --git a/Kernel/SystemExposed.cpp b/Kernel/SystemExposed.cpp index 2a0db7a8f0..8825003397 100644 --- a/Kernel/SystemExposed.cpp +++ b/Kernel/SystemExposed.cpp @@ -55,18 +55,18 @@ SystemExposedFolder::SystemExposedFolder(String name) { } -SystemExposedFolder::SystemExposedFolder(String name, const SystemExposedFolder& parent_folder) +SystemExposedFolder::SystemExposedFolder(String name, SystemExposedFolder const& parent_folder) : SystemExposedComponent(name) , m_parent_folder(parent_folder) { } -NonnullRefPtr SystemExposedFolder::to_inode(const SysFS& sysfs_instance) const +NonnullRefPtr SystemExposedFolder::to_inode(SysFS const& sysfs_instance) const { return SysFSDirectoryInode::create(sysfs_instance, *this); } -NonnullRefPtr SystemExposedComponent::to_inode(const SysFS& sysfs_instance) const +NonnullRefPtr SystemExposedComponent::to_inode(SysFS const& sysfs_instance) const { return SysFSInode::create(sysfs_instance, *this); } diff --git a/Kernel/SystemExposed.h b/Kernel/SystemExposed.h index 2844e57c01..b07ba34b20 100644 --- a/Kernel/SystemExposed.h +++ b/Kernel/SystemExposed.h @@ -26,10 +26,10 @@ public: virtual KResultOr read_bytes(off_t, size_t, UserOrKernelBuffer&, FileDescription*) const { VERIFY_NOT_REACHED(); } virtual KResult traverse_as_directory(unsigned, Function) const { VERIFY_NOT_REACHED(); } virtual RefPtr lookup(StringView) { VERIFY_NOT_REACHED(); }; - virtual KResultOr write_bytes(off_t, size_t, const UserOrKernelBuffer&, FileDescription*) { return -EROFS; } + virtual KResultOr write_bytes(off_t, size_t, UserOrKernelBuffer const&, FileDescription*) { return -EROFS; } virtual size_t size() const { return 0; } - virtual NonnullRefPtr to_inode(const SysFS& sysfs_instance) const; + virtual NonnullRefPtr to_inode(SysFS const&) const; InodeIndex component_index() const { return m_component_index; }; @@ -48,13 +48,13 @@ public: virtual KResultOr entries_count() const override { return m_components.size(); }; virtual KResult traverse_as_directory(unsigned, Function) const override; virtual RefPtr lookup(StringView name) override; - void add_component(const SystemExposedComponent&); + void add_component(SystemExposedComponent const&); - virtual NonnullRefPtr to_inode(const SysFS& sysfs_instance) const override final; + virtual NonnullRefPtr to_inode(SysFS const& sysfs_instance) const override final; protected: explicit SystemExposedFolder(String name); - SystemExposedFolder(String name, const SystemExposedFolder& parent_folder); + SystemExposedFolder(String name, SystemExposedFolder const& parent_folder); NonnullRefPtrVector m_components; RefPtr m_parent_folder; };