jens/cpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fixed Processor::Buffer regression

Browse Source 
git-svn-id: http://moon:8086/svn/software/trunk/libsrc/cpp@1028 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2022-06-17 12:45:41 +00:00
parent 0157bad8d8
commit 7a9483d2d1
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/processor/src/Buffer.tcc
+4 -6
View File
@@ -101,7 +101,6 @@ typename Buffer<T>::Result Buffer<T>::write(const T *pData, size_t len)
RETURN_OR_EXCEPT(Result::Err_InvalidSize); RETURN_OR_EXCEPT(Result::Err_InvalidSize);
} }
size_t numWritten = 0;
while(len) while(len)
{ {
size_t num_remain = m_capacity - m_wi; size_t num_remain = m_capacity - m_wi;
@@ -110,9 +109,9 @@ typename Buffer<T>::Result Buffer<T>::write(const T *pData, size_t len)
memcpy(data_w(), pData, actual_len*sizeof(T)); memcpy(data_w(), pData, actual_len*sizeof(T));
len -= actual_len; len -= actual_len;
pData += actual_len; pData += actual_len;
numWritten += actual_len; produce(actual_len);
} }
return produce(numWritten); return Result::Ok;
} }
template<typename T> template<typename T>
@@ -123,7 +122,6 @@ typename Buffer<T>::Result Buffer<T>::read(T* pData, size_t len)
RETURN_OR_EXCEPT(Result::Err_InvalidSize); RETURN_OR_EXCEPT(Result::Err_InvalidSize);
} }
size_t numRead = 0;
while(len) while(len)
{ {
size_t num_remain = m_capacity - m_ri; size_t num_remain = m_capacity - m_ri;
@@ -132,9 +130,9 @@ typename Buffer<T>::Result Buffer<T>::read(T* pData, size_t len)
memcpy(pData, data_r(), actual_len*sizeof(T)); memcpy(pData, data_r(), actual_len*sizeof(T));
len -= actual_len; len -= actual_len;
pData += actual_len; pData += actual_len;
numRead += actual_len; consume(actual_len);
} }
return consume(numRead); return Result::Ok;
} }
template<typename T> template<typename T>