From 393229e2aa0bbcee82eec6e41f2b86faa996e7d9 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sat, 4 Sep 2021 23:48:46 +0200 Subject: [PATCH] Kernel: Remove UserOrKernelBuffer::copy_into_string() All former users of this API have been converted to use KString. :^) --- Kernel/UserOrKernelBuffer.cpp | 16 +--------------- Kernel/UserOrKernelBuffer.h | 3 +-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Kernel/UserOrKernelBuffer.cpp b/Kernel/UserOrKernelBuffer.cpp index 6f8116acae..6747f31d35 100644 --- a/Kernel/UserOrKernelBuffer.cpp +++ b/Kernel/UserOrKernelBuffer.cpp @@ -1,5 +1,6 @@ /* * Copyright (c) 2020, the SerenityOS developers. + * Copyright (c) 2020, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ @@ -14,21 +15,6 @@ bool UserOrKernelBuffer::is_kernel_buffer() const return !Memory::is_user_address(VirtualAddress(m_buffer)); } -String UserOrKernelBuffer::copy_into_string(size_t size) const -{ - if (!m_buffer) - return {}; - if (Memory::is_user_address(VirtualAddress(m_buffer))) { - char* buffer; - auto data_copy = StringImpl::create_uninitialized(size, buffer); - if (!copy_from_user(buffer, m_buffer, size)) - return {}; - return data_copy; - } - - return String(ReadonlyBytes { m_buffer, size }); -} - KResultOr> UserOrKernelBuffer::try_copy_into_kstring(size_t size) const { if (!m_buffer) diff --git a/Kernel/UserOrKernelBuffer.h b/Kernel/UserOrKernelBuffer.h index dfc11ee6c4..41970e424d 100644 --- a/Kernel/UserOrKernelBuffer.h +++ b/Kernel/UserOrKernelBuffer.h @@ -1,12 +1,12 @@ /* * Copyright (c) 2020, the SerenityOS developers. + * Copyright (c) 2021, Andreas Kling * * SPDX-License-Identifier: BSD-2-Clause */ #pragma once -#include #include #include #include @@ -54,7 +54,6 @@ public: return offset_buffer; } - [[nodiscard]] String copy_into_string(size_t size) const; [[nodiscard]] KResultOr> try_copy_into_kstring(size_t) const; [[nodiscard]] bool write(const void* src, size_t offset, size_t len); [[nodiscard]] bool write(const void* src, size_t len)