From 7a9483d2d1bcfbf66079082f18feb4803d020873 Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Fri, 17 Jun 2022 12:45:41 +0000 Subject: [PATCH] - fixed Processor::Buffer regression git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1028 b431acfa-c32f-4a4a-93f1-934dc6c82436 --- radio/processor/src/Buffer.tcc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/radio/processor/src/Buffer.tcc b/radio/processor/src/Buffer.tcc index 676e889..75ddafd 100644 --- a/radio/processor/src/Buffer.tcc +++ b/radio/processor/src/Buffer.tcc @@ -101,7 +101,6 @@ typename Buffer::Result Buffer::write(const T *pData, size_t len) RETURN_OR_EXCEPT(Result::Err_InvalidSize); } - size_t numWritten = 0; while(len) { size_t num_remain = m_capacity - m_wi; @@ -110,9 +109,9 @@ typename Buffer::Result Buffer::write(const T *pData, size_t len) memcpy(data_w(), pData, actual_len*sizeof(T)); len -= actual_len; pData += actual_len; - numWritten += actual_len; + produce(actual_len); } - return produce(numWritten); + return Result::Ok; } template @@ -123,7 +122,6 @@ typename Buffer::Result Buffer::read(T* pData, size_t len) RETURN_OR_EXCEPT(Result::Err_InvalidSize); } - size_t numRead = 0; while(len) { size_t num_remain = m_capacity - m_ri; @@ -132,9 +130,9 @@ typename Buffer::Result Buffer::read(T* pData, size_t len) memcpy(pData, data_r(), actual_len*sizeof(T)); len -= actual_len; pData += actual_len; - numRead += actual_len; + consume(actual_len); } - return consume(numRead); + return Result::Ok; } template