Browse Source

Kerne: Switch SysFS to east-const style

Andreas Kling 4 years ago
parent
commit
66f483b1a1
4 changed files with 25 additions and 26 deletions
  1. 8 9
      Kernel/FileSystem/SysFS.cpp
  2. 9 9
      Kernel/FileSystem/SysFS.h
  3. 3 3
      Kernel/SystemExposed.cpp
  4. 5 5
      Kernel/SystemExposed.h

+ 8 - 9
Kernel/FileSystem/SysFS.cpp

@@ -5,7 +5,6 @@
  */
  */
 
 
 #include <AK/Singleton.h>
 #include <AK/Singleton.h>
-#include <AK/StringBuilder.h>
 #include <AK/StringView.h>
 #include <AK/StringView.h>
 #include <Kernel/FileSystem/SysFS.h>
 #include <Kernel/FileSystem/SysFS.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
 #include <Kernel/FileSystem/VirtualFileSystem.h>
@@ -85,12 +84,12 @@ NonnullRefPtr<Inode> SysFS::root_inode() const
     return *m_root_inode;
     return *m_root_inode;
 }
 }
 
 
-NonnullRefPtr<SysFSInode> SysFSInode::create(const SysFS& fs, const SystemExposedComponent& component)
+NonnullRefPtr<SysFSInode> SysFSInode::create(SysFS const& fs, SystemExposedComponent const& component)
 {
 {
     return adopt_ref(*new (nothrow) SysFSInode(fs, 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<SysFS&>(fs), component.component_index())
     : Inode(const_cast<SysFS&>(fs), component.component_index())
     , m_associated_component(component)
     , m_associated_component(component)
 {
 {
@@ -128,22 +127,22 @@ void SysFSInode::flush_metadata()
 {
 {
 }
 }
 
 
-KResultOr<size_t> SysFSInode::write_bytes(off_t offset, size_t count, const UserOrKernelBuffer& buffer, FileDescription* fd)
+KResultOr<size_t> SysFSInode::write_bytes(off_t offset, size_t count, UserOrKernelBuffer const& buffer, FileDescription* fd)
 {
 {
     return m_associated_component->write_bytes(offset, count, buffer, fd);
     return m_associated_component->write_bytes(offset, count, buffer, fd);
 }
 }
 
 
-KResultOr<NonnullRefPtr<Inode>> SysFSInode::create_child(const String&, mode_t, dev_t, uid_t, gid_t)
+KResultOr<NonnullRefPtr<Inode>> SysFSInode::create_child(String const&, mode_t, dev_t, uid_t, gid_t)
 {
 {
     return EROFS;
     return EROFS;
 }
 }
 
 
-KResult SysFSInode::add_child(Inode&, const StringView&, mode_t)
+KResult SysFSInode::add_child(Inode&, StringView const&, mode_t)
 {
 {
     return EROFS;
     return EROFS;
 }
 }
 
 
-KResult SysFSInode::remove_child(const StringView&)
+KResult SysFSInode::remove_child(StringView const&)
 {
 {
     return EROFS;
     return EROFS;
 }
 }
@@ -168,12 +167,12 @@ KResult SysFSInode::truncate(u64)
     return EPERM;
     return EPERM;
 }
 }
 
 
-NonnullRefPtr<SysFSDirectoryInode> SysFSDirectoryInode::create(const SysFS& sysfs, const SystemExposedComponent& component)
+NonnullRefPtr<SysFSDirectoryInode> SysFSDirectoryInode::create(SysFS const& sysfs, SystemExposedComponent const& component)
 {
 {
     return adopt_ref(*new (nothrow) SysFSDirectoryInode(sysfs, 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)
     : SysFSInode(fs, component)
     , m_parent_fs(const_cast<SysFS&>(fs))
     , m_parent_fs(const_cast<SysFS&>(fs))
 {
 {

+ 9 - 9
Kernel/FileSystem/SysFS.h

@@ -62,7 +62,7 @@ public:
     static NonnullRefPtr<SysFS> create();
     static NonnullRefPtr<SysFS> create();
 
 
     virtual bool initialize() override;
     virtual bool initialize() override;
-    virtual const char* class_name() const override { return "SysFS"; }
+    virtual char const* class_name() const override { return "SysFS"; }
 
 
     virtual NonnullRefPtr<Inode> root_inode() const override;
     virtual NonnullRefPtr<Inode> root_inode() const override;
 
 
@@ -77,20 +77,20 @@ class SysFSInode : public Inode {
     friend class SysFSDirectoryInode;
     friend class SysFSDirectoryInode;
 
 
 public:
 public:
-    static NonnullRefPtr<SysFSInode> create(const SysFS&, const SystemExposedComponent&);
+    static NonnullRefPtr<SysFSInode> create(SysFS const&, SystemExposedComponent const&);
     StringView name() const { return m_associated_component->name(); }
     StringView name() const { return m_associated_component->name(); }
 
 
 protected:
 protected:
-    SysFSInode(const SysFS&, const SystemExposedComponent&);
+    SysFSInode(SysFS const&, SystemExposedComponent const&);
     virtual KResultOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer& buffer, FileDescription*) const override;
     virtual KResultOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer& buffer, FileDescription*) const override;
     virtual KResult traverse_as_directory(Function<bool(FileSystem::DirectoryEntryView const&)>) const override;
     virtual KResult traverse_as_directory(Function<bool(FileSystem::DirectoryEntryView const&)>) const override;
     virtual RefPtr<Inode> lookup(StringView name) override;
     virtual RefPtr<Inode> lookup(StringView name) override;
     virtual void flush_metadata() override;
     virtual void flush_metadata() override;
     virtual InodeMetadata metadata() const override;
     virtual InodeMetadata metadata() const override;
-    virtual KResultOr<size_t> write_bytes(off_t, size_t, const UserOrKernelBuffer& buffer, FileDescription*) override;
-    virtual KResultOr<NonnullRefPtr<Inode>> 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<size_t> write_bytes(off_t, size_t, UserOrKernelBuffer const&, FileDescription*) override;
+    virtual KResultOr<NonnullRefPtr<Inode>> 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<size_t> directory_entry_count() const override;
     virtual KResultOr<size_t> directory_entry_count() const override;
     virtual KResult chmod(mode_t) override;
     virtual KResult chmod(mode_t) override;
     virtual KResult chown(uid_t, gid_t) override;
     virtual KResult chown(uid_t, gid_t) override;
@@ -104,11 +104,11 @@ class SysFSDirectoryInode : public SysFSInode {
     friend class SysFSRootDirectoryInode;
     friend class SysFSRootDirectoryInode;
 
 
 public:
 public:
-    static NonnullRefPtr<SysFSDirectoryInode> create(const SysFS&, const SystemExposedComponent&);
+    static NonnullRefPtr<SysFSDirectoryInode> create(SysFS const&, SystemExposedComponent const&);
     virtual ~SysFSDirectoryInode() override;
     virtual ~SysFSDirectoryInode() override;
 
 
 protected:
 protected:
-    SysFSDirectoryInode(const SysFS&, const SystemExposedComponent&);
+    SysFSDirectoryInode(SysFS const&, SystemExposedComponent const&);
     // ^Inode
     // ^Inode
     virtual InodeMetadata metadata() const override;
     virtual InodeMetadata metadata() const override;
     virtual KResult traverse_as_directory(Function<bool(FileSystem::DirectoryEntryView const&)>) const override;
     virtual KResult traverse_as_directory(Function<bool(FileSystem::DirectoryEntryView const&)>) const override;

+ 3 - 3
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)
     : SystemExposedComponent(name)
     , m_parent_folder(parent_folder)
     , m_parent_folder(parent_folder)
 {
 {
 }
 }
 
 
-NonnullRefPtr<Inode> SystemExposedFolder::to_inode(const SysFS& sysfs_instance) const
+NonnullRefPtr<Inode> SystemExposedFolder::to_inode(SysFS const& sysfs_instance) const
 {
 {
     return SysFSDirectoryInode::create(sysfs_instance, *this);
     return SysFSDirectoryInode::create(sysfs_instance, *this);
 }
 }
 
 
-NonnullRefPtr<Inode> SystemExposedComponent::to_inode(const SysFS& sysfs_instance) const
+NonnullRefPtr<Inode> SystemExposedComponent::to_inode(SysFS const& sysfs_instance) const
 {
 {
     return SysFSInode::create(sysfs_instance, *this);
     return SysFSInode::create(sysfs_instance, *this);
 }
 }

+ 5 - 5
Kernel/SystemExposed.h

@@ -26,10 +26,10 @@ public:
     virtual KResultOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer&, FileDescription*) const { VERIFY_NOT_REACHED(); }
     virtual KResultOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer&, FileDescription*) const { VERIFY_NOT_REACHED(); }
     virtual KResult traverse_as_directory(unsigned, Function<bool(FileSystem::DirectoryEntryView const&)>) const { VERIFY_NOT_REACHED(); }
     virtual KResult traverse_as_directory(unsigned, Function<bool(FileSystem::DirectoryEntryView const&)>) const { VERIFY_NOT_REACHED(); }
     virtual RefPtr<SystemExposedComponent> lookup(StringView) { VERIFY_NOT_REACHED(); };
     virtual RefPtr<SystemExposedComponent> lookup(StringView) { VERIFY_NOT_REACHED(); };
-    virtual KResultOr<size_t> write_bytes(off_t, size_t, const UserOrKernelBuffer&, FileDescription*) { return -EROFS; }
+    virtual KResultOr<size_t> write_bytes(off_t, size_t, UserOrKernelBuffer const&, FileDescription*) { return -EROFS; }
     virtual size_t size() const { return 0; }
     virtual size_t size() const { return 0; }
 
 
-    virtual NonnullRefPtr<Inode> to_inode(const SysFS& sysfs_instance) const;
+    virtual NonnullRefPtr<Inode> to_inode(SysFS const&) const;
 
 
     InodeIndex component_index() const { return m_component_index; };
     InodeIndex component_index() const { return m_component_index; };
 
 
@@ -48,13 +48,13 @@ public:
     virtual KResultOr<size_t> entries_count() const override { return m_components.size(); };
     virtual KResultOr<size_t> entries_count() const override { return m_components.size(); };
     virtual KResult traverse_as_directory(unsigned, Function<bool(FileSystem::DirectoryEntryView const&)>) const override;
     virtual KResult traverse_as_directory(unsigned, Function<bool(FileSystem::DirectoryEntryView const&)>) const override;
     virtual RefPtr<SystemExposedComponent> lookup(StringView name) override;
     virtual RefPtr<SystemExposedComponent> lookup(StringView name) override;
-    void add_component(const SystemExposedComponent&);
+    void add_component(SystemExposedComponent const&);
 
 
-    virtual NonnullRefPtr<Inode> to_inode(const SysFS& sysfs_instance) const override final;
+    virtual NonnullRefPtr<Inode> to_inode(SysFS const& sysfs_instance) const override final;
 
 
 protected:
 protected:
     explicit SystemExposedFolder(String name);
     explicit SystemExposedFolder(String name);
-    SystemExposedFolder(String name, const SystemExposedFolder& parent_folder);
+    SystemExposedFolder(String name, SystemExposedFolder const& parent_folder);
     NonnullRefPtrVector<SystemExposedComponent> m_components;
     NonnullRefPtrVector<SystemExposedComponent> m_components;
     RefPtr<SystemExposedFolder> m_parent_folder;
     RefPtr<SystemExposedFolder> m_parent_folder;
 };
 };