diff --git a/AK/ByteBuffer.h b/AK/ByteBuffer.h index 449c73aaed..3d130940f4 100644 --- a/AK/ByteBuffer.h +++ b/AK/ByteBuffer.h @@ -50,7 +50,7 @@ public: { if (this != &other) { if (m_size > other.size()) - internal_trim(other.size(), true); + trim(other.size(), true); else resize(other.size()); __builtin_memcpy(data(), other.data(), other.size()); @@ -126,11 +126,6 @@ public: [[nodiscard]] void* end_pointer() { return data() + m_size; } [[nodiscard]] void const* end_pointer() const { return data() + m_size; } - void trim(size_t size) - { - internal_trim(size, false); - } - [[nodiscard]] ByteBuffer slice(size_t offset, size_t size) const { // I cannot hand you a slice I don't have @@ -151,7 +146,7 @@ public: ALWAYS_INLINE void resize(size_t new_size) { if (new_size <= m_size) { - trim(new_size); + trim(new_size, false); return; } ensure_capacity(new_size); @@ -217,7 +212,7 @@ private: other.m_inline = true; } - void internal_trim(size_t size, bool may_discard_existing_data) + void trim(size_t size, bool may_discard_existing_data) { VERIFY(size <= m_size); if (!m_inline && size <= inline_capacity) { diff --git a/Userland/Libraries/LibCore/IODevice.cpp b/Userland/Libraries/LibCore/IODevice.cpp index fb45152999..2fd9e8e87b 100644 --- a/Userland/Libraries/LibCore/IODevice.cpp +++ b/Userland/Libraries/LibCore/IODevice.cpp @@ -61,7 +61,7 @@ ByteBuffer IODevice::read(size_t max_size) int nread = ::read(m_fd, buffer_ptr, remaining_buffer_space); if (nread < 0) { if (taken_from_buffered) { - buffer.trim(taken_from_buffered); + buffer.resize(taken_from_buffered); return buffer; } set_error(errno); @@ -70,12 +70,12 @@ ByteBuffer IODevice::read(size_t max_size) if (nread == 0) { set_eof(true); if (taken_from_buffered) { - buffer.trim(taken_from_buffered); + buffer.resize(taken_from_buffered); return buffer; } return {}; } - buffer.trim(taken_from_buffered + nread); + buffer.resize(taken_from_buffered + nread); return buffer; } @@ -195,7 +195,7 @@ String IODevice::read_line(size_t max_size) Vector new_buffered_data; new_buffered_data.append(m_buffered_data.data() + line_index, m_buffered_data.size() - line_index); m_buffered_data = move(new_buffered_data); - line.trim(line_index); + line.resize(line_index); return String::copy(line, Chomp); } } diff --git a/Userland/Libraries/LibCore/UDPServer.cpp b/Userland/Libraries/LibCore/UDPServer.cpp index 7aab417cac..fa41dfba95 100644 --- a/Userland/Libraries/LibCore/UDPServer.cpp +++ b/Userland/Libraries/LibCore/UDPServer.cpp @@ -72,7 +72,7 @@ ByteBuffer UDPServer::receive(size_t size, sockaddr_in& in) return {}; } - buf.trim(rlen); + buf.resize(rlen); return buf; }