LibIPC: Remove use of ByteBuffer::wrap()

ByteBuffer::wrap() was useful before we had Span. Let's see if we can't
get rid of some more ByteBuffer wrapping.
This commit is contained in:
Andreas Kling 2020-12-19 11:30:02 +01:00
parent d893498e57
commit 0e4ecca336
Notes: sideshowbarker 2024-07-19 00:44:54 +09:00
2 changed files with 5 additions and 5 deletions

View file

@ -24,7 +24,6 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include <AK/ByteBuffer.h>
#include <AK/Function.h>
#include <AK/GenericLexer.h>
#include <AK/HashMap.h>
@ -437,7 +436,7 @@ public:
static String static_name() { return "@endpoint.name@"; }
virtual String name() const override { return "@endpoint.name@"; }
static OwnPtr<IPC::Message> decode_message(const ByteBuffer& buffer, int sockfd)
static OwnPtr<IPC::Message> decode_message(ReadonlyBytes buffer, int sockfd)
{
InputMemoryStream stream { buffer };
i32 message_endpoint_magic = 0;

View file

@ -214,7 +214,7 @@ protected:
if (message_size == 0 || bytes.size() - index - sizeof(uint32_t) < message_size)
break;
index += sizeof(message_size);
auto remaining_bytes = ByteBuffer::wrap(bytes.data() + index, bytes.size() - index);
auto remaining_bytes = ReadonlyBytes { bytes.data() + index, bytes.size() - index };
if (auto message = LocalEndpoint::decode_message(remaining_bytes, m_socket->fd())) {
m_unprocessed_messages.append(message.release_nonnull());
} else if (auto message = PeerEndpoint::decode_message(remaining_bytes, m_socket->fd())) {
@ -229,12 +229,13 @@ protected:
// Sometimes we might receive a partial message. That's okay, just stash away
// the unprocessed bytes and we'll prepend them to the next incoming message
// in the next run of this function.
auto remaining_bytes = ByteBuffer::wrap(bytes.data() + index, bytes.size() - index);
auto remaining_bytes = ByteBuffer::copy(bytes.data() + index, bytes.size() - index);
if (!m_unprocessed_bytes.is_empty()) {
dbg() << *this << "::drain_messages_from_peer: Already have unprocessed bytes";
shutdown();
return false;
}
m_unprocessed_bytes = remaining_bytes.isolated_copy();
m_unprocessed_bytes = remaining_bytes;
}
if (!m_unprocessed_messages.is_empty()) {