From 6555120f3b0dbc783ff5cc22a4ff0ceade53a2d8 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 11 Feb 2014 13:26:32 +0100 Subject: [PATCH] ...and also fix a mismatched prototype gcc2 doesn't seem to notice. --- headers/private/net/DynamicBuffer.h | 2 +- src/kits/network/libnetapi/DynamicBuffer.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/headers/private/net/DynamicBuffer.h b/headers/private/net/DynamicBuffer.h index 58a49d9ca2..4dfb17b2fa 100644 --- a/headers/private/net/DynamicBuffer.h +++ b/headers/private/net/DynamicBuffer.h @@ -26,7 +26,7 @@ public: // Insert data at the end of the buffer. The buffer will be increased to // accomodate the data if needed. - status_t Write(const void* data, size_t size); + ssize_t Write(const void* data, size_t size); // Remove data from the start of the buffer. Move the buffer start // pointer to point to the data following it. diff --git a/src/kits/network/libnetapi/DynamicBuffer.cpp b/src/kits/network/libnetapi/DynamicBuffer.cpp index 18d9a96b89..3a3c9ec074 100644 --- a/src/kits/network/libnetapi/DynamicBuffer.cpp +++ b/src/kits/network/libnetapi/DynamicBuffer.cpp @@ -69,7 +69,7 @@ DynamicBuffer::InitCheck() const } -status_t +ssize_t DynamicBuffer::Write(const void* data, size_t size) { if (fInit != B_OK) @@ -82,7 +82,7 @@ DynamicBuffer::Write(const void* data, size_t size) memcpy(fBuffer + fDataEnd, data, size); fDataEnd += size; - return B_OK; + return size; }