generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-12 10:13:51 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4790 from nyashbox/fix/8bit_integers_in_byteorder_functions

Browse Source 
Treat 8-bit integers correctly in Poco::ByteOrder functions
This commit is contained in:
Günter Obiltschnig 2024-12-01 08:15:38 +01:00 committed by GitHub
commit 2a1f6c246d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 112 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Foundation/include/Poco/ByteOrder.h
View File

@ -32,6 +32,8 @@ class Foundation_API ByteOrder
/// integers of various sizes.
{
public:
static Int8 flipBytes(Int8 value);
static UInt8 flipBytes(UInt8 value);
static Int16 flipBytes(Int16 value);
static UInt16 flipBytes(UInt16 value);
static Int32 flipBytes(Int32 value);
@ -43,6 +45,8 @@ public:
static UInt64 flipBytes(UInt64 value);
#endif
static Int8 toBigEndian(Int8 value);
static UInt8 toBigEndian(UInt8 value);
static Int16 toBigEndian(Int16 value);
static UInt16 toBigEndian (UInt16 value);
static Int32 toBigEndian(Int32 value);
@ -52,6 +56,8 @@ public:
static UInt64 toBigEndian (UInt64 value);
#endif
static Int8 fromBigEndian(Int8 value);
static UInt8 fromBigEndian(UInt8 value);
static Int16 fromBigEndian(Int16 value);
static UInt16 fromBigEndian (UInt16 value);
static Int32 fromBigEndian(Int32 value);
@ -61,6 +67,8 @@ public:
static UInt64 fromBigEndian (UInt64 value);
#endif
static Int8 toLittleEndian(Int8 value);
static UInt8 toLittleEndian(UInt8 value);
static Int16 toLittleEndian(Int16 value);
static UInt16 toLittleEndian (UInt16 value);
static Int32 toLittleEndian(Int32 value);
@ -70,6 +78,8 @@ public:
static UInt64 toLittleEndian (UInt64 value);
#endif
static Int8 fromLittleEndian(Int8 value);
static UInt8 fromLittleEndian(UInt8 value);
static Int16 fromLittleEndian(Int16 value);
static UInt16 fromLittleEndian (UInt16 value);
static Int32 fromLittleEndian(Int32 value);
@ -79,6 +89,8 @@ public:
static UInt64 fromLittleEndian (UInt64 value);
#endif
static Int8 toNetwork(Int8 value);
static UInt8 toNetwork(UInt8 value);
static Int16 toNetwork(Int16 value);
static UInt16 toNetwork (UInt16 value);
static Int32 toNetwork(Int32 value);
@ -88,6 +100,8 @@ public:
static UInt64 toNetwork (UInt64 value);
#endif
static Int8 fromNetwork(Int8 value);
static UInt8 fromNetwork(UInt8 value);
static Int16 fromNetwork(Int16 value);
static UInt16 fromNetwork (UInt16 value);
static Int32 fromNetwork(Int32 value);
@ -132,6 +146,18 @@ private:
//
// inlines
//
inline UInt8 ByteOrder::flipBytes(UInt8 value)
{
return value;
}
inline Int8 ByteOrder::flipBytes(Int8 value)
{
return value;
}
inline UInt16 ByteOrder::flipBytes(UInt16 value)
{
#if defined(POCO_HAVE_MSC_BYTESWAP)
@ -218,6 +244,8 @@ inline Int64 ByteOrder::flipBytes(Int64 value)
#if defined(POCO_HAVE_INT64)
#define POCO_IMPLEMENT_BYTEORDER_NOOP(op) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int8) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, UInt8) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int16) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, UInt16) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int32) \
@ -225,6 +253,8 @@ inline Int64 ByteOrder::flipBytes(Int64 value)
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int64) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, UInt64)
#define POCO_IMPLEMENT_BYTEORDER_FLIP(op) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, Int8) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, UInt8) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, Int16) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, UInt16) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, Int32) \
@ -233,11 +263,15 @@ inline Int64 ByteOrder::flipBytes(Int64 value)
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, UInt64)
#else
#define POCO_IMPLEMENT_BYTEORDER_NOOP(op) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int8) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, UInt8) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int16) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, UInt16) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, Int32) \
POCO_IMPLEMENT_BYTEORDER_NOOP_(op, UInt32)
#define POCO_IMPLEMENT_BYTEORDER_FLIP(op) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, Int8) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, UInt8) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, Int16) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, UInt16) \
POCO_IMPLEMENT_BYTEORDER_FLIP_(op, Int32) \

78
Foundation/testsuite/src/ByteOrderTest.cpp
View File

@ -15,6 +15,8 @@
using Poco::ByteOrder;
using Poco::Int8;
using Poco::UInt8;
using Poco::Int16;
using Poco::UInt16;
using Poco::Int32;
@ -37,6 +39,16 @@ ByteOrderTest::~ByteOrderTest()
void ByteOrderTest::testByteOrderFlip()
{
{
Int8 norm = (Int8) 0xAB;
Int8 flip = ByteOrder::flipBytes(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = (UInt8) 0xAB;
UInt8 flip = ByteOrder::flipBytes(norm);
assertTrue (norm == flip);
}
{
Int16 norm = (Int16) 0xAABB;
Int16 flip = ByteOrder::flipBytes(norm);
@ -86,6 +98,29 @@ void ByteOrderTest::testByteOrderFlip()
void ByteOrderTest::testByteOrderBigEndian()
{
//
// all systems
//
{
Int8 norm = 4;
Int8 flip = ByteOrder::toBigEndian(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = 4;
UInt8 flip = ByteOrder::toBigEndian(norm);
assertTrue (norm == flip);
}
{
Int8 norm = 4;
Int8 flip = ByteOrder::fromBigEndian(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = 4;
UInt8 flip = ByteOrder::fromBigEndian(norm);
assertTrue (norm == flip);
}
#if defined(POCO_ARCH_BIG_ENDIAN)
//
// big-endian systems
@ -254,6 +289,29 @@ void ByteOrderTest::testByteOrderBigEndian()
void ByteOrderTest::testByteOrderLittleEndian()
{
//
// all systems
//
{
Int8 norm = 4;
Int8 flip = ByteOrder::toLittleEndian(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = 4;
UInt8 flip = ByteOrder::toLittleEndian(norm);
assertTrue (norm == flip);
}
{
Int8 norm = 4;
Int8 flip = ByteOrder::fromLittleEndian(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = 4;
UInt8 flip = ByteOrder::fromLittleEndian(norm);
assertTrue (norm == flip);
}
#if defined(POCO_ARCH_LITTLE_ENDIAN)
//
// big-endian systems
@ -422,6 +480,26 @@ void ByteOrderTest::testByteOrderLittleEndian()
void ByteOrderTest::testByteOrderNetwork()
{
{
Int8 norm = 4;
Int8 flip = ByteOrder::toNetwork(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = 4;
UInt8 flip = ByteOrder::toNetwork(norm);
assertTrue (norm == flip);
}
{
Int8 norm = 4;
Int8 flip = ByteOrder::fromNetwork(norm);
assertTrue (norm == flip);
}
{
UInt8 norm = 4;
UInt8 flip = ByteOrder::fromNetwork(norm);
assertTrue (norm == flip);
}
#if defined(POCO_ARCH_BIG_ENDIAN)
//
// big-endian systems