From a05da9f4b2c6548ad36e0ad711dae672affbbf27 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Wed, 18 Jun 2014 21:27:34 +0200 Subject: [PATCH] Revert "...and also fix a mismatched prototype" This reverts commit 6555120f3b0dbc783ff5cc22a4ff0ceade53a2d8. --- 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 4dfb17b2fa..58a49d9ca2 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. - ssize_t Write(const void* data, size_t size); + status_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 9f336df287..75f4a46458 100644 --- a/src/kits/network/libnetapi/DynamicBuffer.cpp +++ b/src/kits/network/libnetapi/DynamicBuffer.cpp @@ -67,7 +67,7 @@ DynamicBuffer::InitCheck() const } -ssize_t +status_t DynamicBuffer::Write(const void* data, size_t size) { if (fInit != B_OK) @@ -80,7 +80,7 @@ DynamicBuffer::Write(const void* data, size_t size) memcpy(fBuffer + fDataEnd, data, size); fDataEnd += size; - return size; + return B_OK; }