morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-14 00:14:11 +09:00
Code Issues Packages Projects Releases Wiki Activity

[utils,ringbuffer] fix debug log messages

Browse Source 
Renaming some variables also in debug messages
This commit is contained in:
Armin Novak
2026-03-03 13:18:36 +01:00
parent 2b8ecce7a9
commit 125b1ce99e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libfreerdp/utils/ringbuffer.c
View File

@@ -49,7 +49,7 @@ BOOL ringbuffer_init(RingBuffer* ringbuffer, size_t initialSize)
ringbuffer->readPtr = ringbuffer->writePtr = 0;
ringbuffer->initialSize = ringbuffer->size = ringbuffer->freeSize = initialSize;
DEBUG_RINGBUFFER("ringbuffer_init(%p)", (void*)rb);
DEBUG_RINGBUFFER("ringbuffer_init(%p)", (void*)ringbuffer);
return TRUE;
}
@@ -79,7 +79,8 @@ static BOOL ringbuffer_realloc(RingBuffer* ringbuffer, size_t targetSize)
{
WINPR_ASSERT(ringbuffer);
BYTE* newData = nullptr;
DEBUG_RINGBUFFER("ringbuffer_realloc(%p): targetSize: %" PRIdz "", (void*)rb, targetSize);
DEBUG_RINGBUFFER("ringbuffer_realloc(%p): targetSize: %" PRIdz "", (void*)ringbuffer,
targetSize);
if (ringbuffer->writePtr == ringbuffer->readPtr)
{
@@ -172,7 +173,7 @@ BOOL ringbuffer_write(RingBuffer* ringbuffer, const BYTE* ptr, size_t sz)
size_t remaining = 0;
WINPR_ASSERT(ringbuffer);
DEBUG_RINGBUFFER("ringbuffer_write(%p): sz: %" PRIdz "", (void*)rb, sz);
DEBUG_RINGBUFFER("ringbuffer_write(%p): sz: %" PRIdz "", (void*)ringbuffer, sz);
if ((ringbuffer->freeSize <= sz) && !ringbuffer_realloc(ringbuffer, ringbuffer->size + sz))
return FALSE;
@@ -206,7 +207,7 @@ BOOL ringbuffer_write(RingBuffer* ringbuffer, const BYTE* ptr, size_t sz)
BYTE* ringbuffer_ensure_linear_write(RingBuffer* ringbuffer, size_t sz)
{
DEBUG_RINGBUFFER("ringbuffer_ensure_linear_write(%p): sz: %" PRIdz "", (void*)rb, sz);
DEBUG_RINGBUFFER("ringbuffer_ensure_linear_write(%p): sz: %" PRIdz "", (void*)ringbuffer, sz);
WINPR_ASSERT(ringbuffer);
if (ringbuffer->freeSize < sz)
@@ -239,7 +240,7 @@ BYTE* ringbuffer_ensure_linear_write(RingBuffer* ringbuffer, size_t sz)
BOOL ringbuffer_commit_written_bytes(RingBuffer* ringbuffer, size_t sz)
{
DEBUG_RINGBUFFER("ringbuffer_commit_written_bytes(%p): sz: %" PRIdz "", (void*)rb, sz);
DEBUG_RINGBUFFER("ringbuffer_commit_written_bytes(%p): sz: %" PRIdz "", (void*)ringbuffer, sz);
WINPR_ASSERT(ringbuffer);
if (sz < 1)
@@ -259,7 +260,7 @@ int ringbuffer_peek(const RingBuffer* ringbuffer, DataChunk chunks[2], size_t sz
size_t toRead = 0;
int chunkIndex = 0;
int status = 0;
DEBUG_RINGBUFFER("ringbuffer_peek(%p): sz: %" PRIdz "", (const void*)rb, sz);
DEBUG_RINGBUFFER("ringbuffer_peek(%p): sz: %" PRIdz "", (const void*)ringbuffer, sz);
WINPR_ASSERT(ringbuffer);
if (sz < 1)