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

[winpr,stream] Add Stream_ResetPosition

Browse Source 
A helper function that does not require return checks, in contrast to
Stream_SetPosition, which might fail.
This commit is contained in:
Armin Novak
2026-02-27 20:04:43 +01:00
parent 41c9286c3c
commit 92ab55c5e1
65 changed files with 175 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
winpr/include/winpr/stream.h
View File

@@ -1319,6 +1319,20 @@ extern "C"
return WINPR_STREAM_CAST(size_t, (_s->pointer - _s->buffer));
}
/** @brief helper to reset stream read/write position to beginning of stream.
*
* Same as \ref Stream_SetPosition(s, 0) but does not need bounds checks.
*
* @param _s A stream to reset the position on. Must not be \b nullptr
*
* @since version 3.24.0
*/
static inline void Stream_ResetPosition(wStream* _s)
{
WINPR_ASSERT(_s);
_s->pointer = _s->buffer;
}
WINPR_API BOOL Stream_SetPosition(wStream* _s, size_t _p);
WINPR_API void Stream_SealLength(wStream* _s);

2
winpr/libwinpr/utils/collections/StreamPool.c
View File

@@ -246,7 +246,7 @@ wStream* StreamPool_Take(wStreamPool* pool, size_t size)
}
else if (s)
{
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
Stream_SetLength(s, Stream_Capacity(s));
StreamPool_ShiftAvailable(pool, foundIndex);
}

30
winpr/libwinpr/utils/test/TestStream.c
View File

@@ -97,13 +97,13 @@ static BOOL TestStream_Static(void)
/* Test creation of a static stream */
Stream_StaticInit(s, buffer, sizeof(buffer));
Stream_Write_UINT16(s, 0xcab1);
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
Stream_Read_UINT16(s, v);
if (v != 0xcab1)
return FALSE;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
Stream_Write_UINT16(s, 1);
if (!Stream_EnsureRemainingCapacity(s, 10)) /* we can ask for 10 bytes */
@@ -114,7 +114,7 @@ static BOOL TestStream_Static(void)
return FALSE;
Stream_Write_UINT16(s, 2);
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
Stream_Read_UINT16(s, v);
if (v != 1)
@@ -264,7 +264,7 @@ fail:
_t _a = 0; \
_t _b = 0; \
BYTE* _p = Stream_Buffer(_s); \
Stream_SetPosition(_s, 0); \
Stream_ResetPosition(_s); \
Stream_Peek_##_t(_s, _a); \
Stream_Read_##_t(_s, _b); \
if (_a != _b) \
@@ -290,7 +290,7 @@ fail:
} \
} \
/* printf("a: 0x%016llX\n", a); */ \
Stream_SetPosition(_s, 0); \
Stream_ResetPosition(_s); \
Stream_Peek_##_t##_BE(_s, _a); \
Stream_Read_##_t##_BE(_s, _b); \
if (_a != _b) \
@@ -505,7 +505,7 @@ static BOOL TestStream_Write(void)
if (s->pointer != s->buffer + sizeof(data))
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -515,7 +515,7 @@ static BOOL TestStream_Write(void)
if (s->pointer != s->buffer + 1)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -530,7 +530,7 @@ static BOOL TestStream_Write(void)
if (s->pointer != s->buffer + 2)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -545,7 +545,7 @@ static BOOL TestStream_Write(void)
if (s->pointer != s->buffer + 4)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -560,7 +560,7 @@ static BOOL TestStream_Write(void)
if (s->pointer != s->buffer + 8)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -678,7 +678,7 @@ static BOOL TestStream_Zero(void)
if (memcmp(Stream_Buffer(s), data, sizeof(data)) != 0)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -691,7 +691,7 @@ static BOOL TestStream_Zero(void)
if (memcmp(Stream_ConstPointer(s), data + 5, sizeof(data) - 5) != 0)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -726,7 +726,7 @@ static BOOL TestStream_Fill(void)
if (memcmp(Stream_Buffer(s), data, sizeof(data)) != 0)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -739,7 +739,7 @@ static BOOL TestStream_Fill(void)
if (memcmp(Stream_ConstPointer(s), data + sizeof(fill), sizeof(data) - sizeof(fill)) != 0)
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;
@@ -774,7 +774,7 @@ static BOOL TestStream_Copy(void)
if (s->pointer != s->buffer + sizeof(data))
goto out;
Stream_SetPosition(s, 0);
Stream_ResetPosition(s);
if (s->pointer != s->buffer)
goto out;