From 334ae3c73b127d806131a45482b0c55d6ab1cae8 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 25 Nov 2013 12:28:38 +0100 Subject: [PATCH] VFS FIFO: Fix RingBuffer::Read()/Write() return types size_t -> ssize_t, since they may actually return an error code. --- src/system/kernel/fs/fifo.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/system/kernel/fs/fifo.cpp b/src/system/kernel/fs/fifo.cpp index 9c771ff816..1735c269b3 100644 --- a/src/system/kernel/fs/fifo.cpp +++ b/src/system/kernel/fs/fifo.cpp @@ -64,8 +64,8 @@ public: status_t CreateBuffer(); void DeleteBuffer(); - size_t Write(const void* buffer, size_t length); - size_t Read(void* buffer, size_t length); + ssize_t Write(const void* buffer, size_t length); + ssize_t Read(void* buffer, size_t length); ssize_t UserWrite(const void* buffer, ssize_t length); ssize_t UserRead(void* buffer, ssize_t length); @@ -267,7 +267,7 @@ RingBuffer::DeleteBuffer() } -inline size_t +inline ssize_t RingBuffer::Write(const void* buffer, size_t length) { if (fBuffer == NULL) @@ -277,7 +277,7 @@ RingBuffer::Write(const void* buffer, size_t length) } -inline size_t +inline ssize_t RingBuffer::Read(void* buffer, size_t length) { if (fBuffer == NULL) @@ -418,7 +418,7 @@ Inode::WriteDataToBuffer(const void* _data, size_t* _length, bool nonBlocking) if (toWrite > dataSize) toWrite = dataSize; - if (toWrite > 0 && fBuffer.UserWrite(data, toWrite) < B_OK) + if (toWrite > 0 && fBuffer.UserWrite(data, toWrite) < 0) return B_BAD_ADDRESS; data += toWrite; @@ -474,7 +474,7 @@ Inode::ReadDataFromBuffer(void* data, size_t* _length, bool nonBlocking, if (toRead > dataSize) toRead = dataSize; - if (fBuffer.UserRead(data, toRead) < B_OK) + if (fBuffer.UserRead(data, toRead) < 0) return B_BAD_ADDRESS; NotifyBytesRead(toRead);