Kernel: Make File::absolute_path() const.

awesomekling · awesomekling · commit 2dd9ef6863f8 · 2019-06-01T18:56:56.000+02:00
diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp
@@ -14,7 +14,7 @@ Device::~Device()
     VFS::the().unregister_device({}, *this);
 }
 
-String Device::absolute_path(FileDescriptor&) const
+String Device::absolute_path(const FileDescriptor&) const
 {
     return String::format("device:%u,%u (%s)", m_major, m_minor, class_name());
 }
diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h
@@ -43,7 +43,7 @@ class Device : public File {
     unsigned major() const { return m_major; }
     unsigned minor() const { return m_minor; }
 
-    virtual String absolute_path(FileDescriptor&) const override;
+    virtual String absolute_path(const FileDescriptor&) const override;
 
     uid_t uid() const { return m_uid; }
     uid_t gid() const { return m_gid; }
diff --git a/Kernel/File.h b/Kernel/File.h
@@ -27,7 +27,7 @@ class File : public Retainable<File> {
     virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg);
     virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot);
 
-    virtual String absolute_path(FileDescriptor&) const = 0;
+    virtual String absolute_path(const FileDescriptor&) const = 0;
 
     virtual KResult truncate(off_t) { return KResult(-EINVAL); }
 
diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp
@@ -115,7 +115,7 @@ ssize_t FIFO::write(FileDescriptor&, const byte* buffer, ssize_t size)
     return m_buffer.write(buffer, size);
 }
 
-String FIFO::absolute_path(FileDescriptor&) const
+String FIFO::absolute_path(const FileDescriptor&) const
 {
     return String::format("fifo:%u", this);
 }
diff --git a/Kernel/FileSystem/FIFO.h b/Kernel/FileSystem/FIFO.h
@@ -33,7 +33,7 @@ class FIFO final : public File {
     virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override;
     virtual bool can_read(FileDescriptor&) const override;
     virtual bool can_write(FileDescriptor&) const override;
-    virtual String absolute_path(FileDescriptor&) const override;
+    virtual String absolute_path(const FileDescriptor&) const override;
     virtual const char* class_name() const override { return "FIFO"; }
     virtual bool is_fifo() const override { return true; }
 
diff --git a/Kernel/FileSystem/FileDescriptor.cpp b/Kernel/FileSystem/FileDescriptor.cpp
@@ -243,7 +243,7 @@ int FileDescriptor::close()
     return 0;
 }
 
-String FileDescriptor::absolute_path()
+String FileDescriptor::absolute_path() const
 {
     if (m_custody)
         return m_custody->absolute_path();
diff --git a/Kernel/FileSystem/FileDescriptor.h b/Kernel/FileSystem/FileDescriptor.h
@@ -43,7 +43,7 @@ class FileDescriptor : public Retainable<FileDescriptor> {
 
     ByteBuffer read_entire_file();
 
-    String absolute_path();
+    String absolute_path() const;
 
     bool is_directory() const;
 
diff --git a/Kernel/FileSystem/InodeFile.cpp b/Kernel/FileSystem/InodeFile.cpp
@@ -41,7 +41,7 @@ KResultOr<Region*> InodeFile::mmap(Process& process, LinearAddress preferred_lad
     return region;
 }
 
-String InodeFile::absolute_path(FileDescriptor& descriptor) const
+String InodeFile::absolute_path(const FileDescriptor& descriptor) const
 {
     ASSERT_NOT_REACHED();
     ASSERT(descriptor.custody());
diff --git a/Kernel/FileSystem/InodeFile.h b/Kernel/FileSystem/InodeFile.h
@@ -23,7 +23,7 @@ class InodeFile final : public File {
     virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override;
     virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot) override;
 
-    virtual String absolute_path(FileDescriptor&) const override;
+    virtual String absolute_path(const FileDescriptor&) const override;
 
     virtual KResult truncate(off_t) override;
 
diff --git a/Kernel/Net/Socket.cpp b/Kernel/Net/Socket.cpp
@@ -142,7 +142,7 @@ static const char* to_string(SocketRole role)
     }
 }
 
-String Socket::absolute_path(FileDescriptor& descriptor) const
+String Socket::absolute_path(const FileDescriptor& descriptor) const
 {
     return String::format("socket:%x (role: %s)", this, to_string(descriptor.socket_role()));
 }
diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h
@@ -62,7 +62,7 @@ class Socket : public File {
 
     Lock& lock() { return m_lock; }
 
-    virtual String absolute_path(FileDescriptor&) const override;
+    virtual String absolute_path(const FileDescriptor&) const override;
 
 protected:
     Socket(int domain, int type, int protocol);
diff --git a/Kernel/ProcessTracer.cpp b/Kernel/ProcessTracer.cpp
@@ -29,7 +29,7 @@ int ProcessTracer::read(FileDescriptor&, byte* buffer, int buffer_size)
     return sizeof(data);
 }
 
-String ProcessTracer::absolute_path(FileDescriptor&) const
+String ProcessTracer::absolute_path(const FileDescriptor&) const
 {
     return String::format("tracer:%d", m_pid);
 }
diff --git a/Kernel/ProcessTracer.h b/Kernel/ProcessTracer.h
@@ -18,7 +18,7 @@ class ProcessTracer : public File {
     virtual bool can_write(FileDescriptor&) const override { return true; }
     virtual int write(FileDescriptor&, const byte*, int) override { return -EIO; }
 
-    virtual String absolute_path(FileDescriptor&) const override;
+    virtual String absolute_path(const FileDescriptor&) const override;
 
     void did_syscall(dword function, dword arg1, dword arg2, dword arg3, dword result);
     pid_t pid() const { return m_pid; }
diff --git a/Kernel/SharedMemory.cpp b/Kernel/SharedMemory.cpp
@@ -68,7 +68,7 @@ KResult SharedMemory::truncate(int length)
     return KResult(-ENOTIMPL);
 }
 
-String SharedMemory::absolute_path(FileDescriptor&) const
+String SharedMemory::absolute_path(const FileDescriptor&) const
 {
     return String::format("shm:%u", this);
 }
diff --git a/Kernel/SharedMemory.h b/Kernel/SharedMemory.h
@@ -28,7 +28,7 @@ class SharedMemory : public File {
     virtual bool can_write(FileDescriptor&) const override { return true; }
     virtual int read(FileDescriptor&, byte*, int) override;
     virtual int write(FileDescriptor&, const byte*, int) override;
-    virtual String absolute_path(FileDescriptor&) const override;
+    virtual String absolute_path(const FileDescriptor&) const override;
     virtual const char* class_name() const override { return "SharedMemory"; }
     virtual bool is_shared_memory() const override { return true; }
     virtual KResultOr<Region*> mmap(Process&, LinearAddress, size_t offset, size_t size, int prot) override;
diff --git a/Kernel/TTY/TTY.h b/Kernel/TTY/TTY.h
@@ -15,7 +15,7 @@ class TTY : public CharacterDevice {
     virtual bool can_read(FileDescriptor&) const override;
     virtual bool can_write(FileDescriptor&) const override;
     virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override final;
-    virtual String absolute_path(FileDescriptor&) const override { return tty_name(); }
+    virtual String absolute_path(const FileDescriptor&) const override { return tty_name(); }
 
     virtual String tty_name() const = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ Device::~Device()`
`14`	`14`	`VFS::the().unregister_device({}, *this);`
`15`	`15`	`}`
`16`	`16`
`17`		`-String Device::absolute_path(FileDescriptor&) const`
	`17`	`+String Device::absolute_path(const FileDescriptor&) const`
`18`	`18`	`{`
`19`	`19`	`return String::format("device:%u,%u (%s)", m_major, m_minor, class_name());`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ ssize_t FIFO::write(FileDescriptor&, const byte* buffer, ssize_t size)`
`115`	`115`	`return m_buffer.write(buffer, size);`
`116`	`116`	`}`
`117`	`117`
`118`		`-String FIFO::absolute_path(FileDescriptor&) const`
	`118`	`+String FIFO::absolute_path(const FileDescriptor&) const`
`119`	`119`	`{`
`120`	`120`	`return String::format("fifo:%u", this);`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ int FileDescriptor::close()`
`243`	`243`	`return 0;`
`244`	`244`	`}`
`245`	`245`
`246`		`-String FileDescriptor::absolute_path()`
	`246`	`+String FileDescriptor::absolute_path() const`
`247`	`247`	`{`
`248`	`248`	`if (m_custody)`
`249`	`249`	`return m_custody->absolute_path();`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ KResultOr<Region*> InodeFile::mmap(Process& process, LinearAddress preferred_lad`
`41`	`41`	`return region;`
`42`	`42`	`}`
`43`	`43`
`44`		`-String InodeFile::absolute_path(FileDescriptor& descriptor) const`
	`44`	`+String InodeFile::absolute_path(const FileDescriptor& descriptor) const`
`45`	`45`	`{`
`46`	`46`	`ASSERT_NOT_REACHED();`
`47`	`47`	`ASSERT(descriptor.custody());`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ static const char* to_string(SocketRole role)`
`142`	`142`	`}`
`143`	`143`	`}`
`144`	`144`
`145`		`-String Socket::absolute_path(FileDescriptor& descriptor) const`
	`145`	`+String Socket::absolute_path(const FileDescriptor& descriptor) const`
`146`	`146`	`{`
`147`	`147`	`return String::format("socket:%x (role: %s)", this, to_string(descriptor.socket_role()));`
`148`	`148`	`}`