ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't tidy in extract as we assume the space will be used soon.

This commit is contained in:
Isaac Connor 2021-04-19 10:25:45 -04:00
parent a9afdbddf1
commit 63d7c9a577
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_buffer.h
View File

@ -41,7 +41,7 @@ class Buffer {
} }
explicit Buffer(unsigned int pSize) : mAllocation(pSize), mSize(0) { explicit Buffer(unsigned int pSize) : mAllocation(pSize), mSize(0) {
mHead = mStorage = new unsigned char[mAllocation]; mHead = mStorage = new unsigned char[mAllocation];
if (mAllocation) *mHead = '\n'; if (mAllocation) *mHead = '\0';
mTail = mHead; mTail = mHead;
} }
Buffer(const unsigned char *pStorage, unsigned int pSize) : Buffer(const unsigned char *pStorage, unsigned int pSize) :
@ -111,6 +111,8 @@ class Buffer {
unsigned int expand(unsigned int count); unsigned int expand(unsigned int count);
// Return pointer to the first pSize bytes and advance the head // Return pointer to the first pSize bytes and advance the head
// We don't call tidy here because it is assumed the ram will be used afterwards
// This differs from consume
unsigned char *extract(unsigned int pSize) { unsigned char *extract(unsigned int pSize) {
if (pSize > mSize) { if (pSize > mSize) {
Warning("Attempt to extract %d bytes of buffer, size is only %d bytes", Warning("Attempt to extract %d bytes of buffer, size is only %d bytes",
@ -120,7 +122,6 @@ class Buffer {
unsigned char *oldHead = mHead; unsigned char *oldHead = mHead;
mHead += pSize; mHead += pSize;
mSize -= pSize; mSize -= pSize;
tidy(0);
return oldHead; return oldHead;
} }
// Add bytes to the end of the buffer // Add bytes to the end of the buffer
@ -149,6 +150,8 @@ class Buffer {
mTail = mHead + mSize; mTail = mHead + mSize;
} }
} }
} else if (mSize == 0) {
*mHead = '\0';
} }
} }