From 5646a9516118caecb72f02a1bc226a9239eb8313 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 7 Jan 2020 07:23:16 +0100 Subject: [PATCH] Kernel: Make Socket::absolute_path() pure virtual This is overridden by all subclasses, so can just be pure virtual. --- Kernel/Net/Socket.cpp | 24 ------------------------ Kernel/Net/Socket.h | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/Kernel/Net/Socket.cpp b/Kernel/Net/Socket.cpp index e65507da82..7d6cc20ac3 100644 --- a/Kernel/Net/Socket.cpp +++ b/Kernel/Net/Socket.cpp @@ -140,30 +140,6 @@ void Socket::load_send_deadline() m_send_deadline.tv_usec %= 1000000; } -String Socket::absolute_path(const FileDescription& description) const -{ - StringBuilder builder; - builder.appendf("socket:%x", this); - - switch (role(description)) { - case Role::None: - break; - case Role::Listener: - builder.append(" (listening)"); - break; - case Role::Accepted: - builder.append(" (accepted)"); - break; - case Role::Connected: - builder.append(" (connected)"); - break; - case Role::Connecting: - builder.append(" (connecting)"); - break; - } - return builder.to_string(); -} - ssize_t Socket::read(FileDescription& description, u8* buffer, ssize_t size) { return recvfrom(description, buffer, size, 0, nullptr, 0); diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h index 6a1a21334d..3d839e6746 100644 --- a/Kernel/Net/Socket.h +++ b/Kernel/Net/Socket.h @@ -94,7 +94,7 @@ public: // ^File virtual ssize_t read(FileDescription&, u8*, ssize_t) override final; virtual ssize_t write(FileDescription&, const u8*, ssize_t) override final; - virtual String absolute_path(const FileDescription&) const override; + virtual String absolute_path(const FileDescription&) const override = 0; protected: Socket(int domain, int type, int protocol);