You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2023/02/22 18:11:42 UTC
[trafficserver] branch master updated: Eliminates the anonymous struct, which is not standard C++ (#9452)
This is an automated email from the ASF dual-hosted git repository.
zwoop pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 30b735d70 Eliminates the anonymous struct, which is not standard C++ (#9452)
30b735d70 is described below
commit 30b735d70850fefd0fdf08f32b5949ca91150f05
Author: Leif Hedstrom <zw...@apache.org>
AuthorDate: Wed Feb 22 11:11:35 2023 -0700
Eliminates the anonymous struct, which is not standard C++ (#9452)
---
include/tscore/ink_uuid.h | 22 ++++++++++++----------
src/tscore/ink_uuid.cc | 13 +++++++------
2 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/include/tscore/ink_uuid.h b/include/tscore/ink_uuid.h
index 7106d24c6..5380cc39d 100644
--- a/include/tscore/ink_uuid.h
+++ b/include/tscore/ink_uuid.h
@@ -72,37 +72,37 @@ public:
uint32_t
getTimeLow() const
{
- return _uuid.timeLow;
+ return _uuid._rfc4122.timeLow;
}
uint16_t
getTimeMid() const
{
- return _uuid.timeMid;
+ return _uuid._rfc4122.timeMid;
}
uint16_t
getTimeHighAndVersion() const
{
- return _uuid.timeHighAndVersion;
+ return _uuid._rfc4122.timeHighAndVersion;
}
uint8_t
getClockSeqAndReserved() const
{
- return _uuid.clockSeqAndReserved;
+ return _uuid._rfc4122.clockSeqAndReserved;
}
uint8_t
getClockSeqLow() const
{
- return _uuid.clockSeqLow;
+ return _uuid._rfc4122.clockSeqLow;
}
const uint8_t *
getNode() const
{
- return _uuid.node;
+ return _uuid._rfc4122.node;
}
private:
@@ -118,7 +118,7 @@ private:
uint8_t clockSeqAndReserved;
uint8_t clockSeqLow;
uint8_t node[6];
- };
+ } _rfc4122;
} _uuid;
// This is the typically used visible portion of the UUID
@@ -128,9 +128,11 @@ private:
bool
_toString(char *buf)
{
- int len = snprintf(buf, TS_UUID_STRING_LEN + 1, "%08x-%04hx-%04hx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
- _uuid.timeLow, _uuid.timeMid, _uuid.timeHighAndVersion, _uuid.clockSeqAndReserved, _uuid.clockSeqLow,
- _uuid.node[0], _uuid.node[1], _uuid.node[2], _uuid.node[3], _uuid.node[4], _uuid.node[5]);
+ int len =
+ snprintf(buf, TS_UUID_STRING_LEN + 1, "%08x-%04hx-%04hx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx",
+ _uuid._rfc4122.timeLow, _uuid._rfc4122.timeMid, _uuid._rfc4122.timeHighAndVersion,
+ _uuid._rfc4122.clockSeqAndReserved, _uuid._rfc4122.clockSeqLow, _uuid._rfc4122.node[0], _uuid._rfc4122.node[1],
+ _uuid._rfc4122.node[2], _uuid._rfc4122.node[3], _uuid._rfc4122.node[4], _uuid._rfc4122.node[5]);
return (len == TS_UUID_STRING_LEN);
}
diff --git a/src/tscore/ink_uuid.cc b/src/tscore/ink_uuid.cc
index 28011d6f9..898a49ae9 100644
--- a/src/tscore/ink_uuid.cc
+++ b/src/tscore/ink_uuid.cc
@@ -41,8 +41,8 @@ ATSUuid::initialize(TSUuidVersion v)
break;
case TS_UUID_V4:
RAND_bytes(_uuid.data, sizeof(_uuid.data));
- _uuid.clockSeqAndReserved = static_cast<uint8_t>((_uuid.clockSeqAndReserved & 0x3F) | 0x80);
- _uuid.timeHighAndVersion = static_cast<uint16_t>((_uuid.timeHighAndVersion & 0x0FFF) | 0x4000);
+ _uuid._rfc4122.clockSeqAndReserved = static_cast<uint8_t>((_uuid._rfc4122.clockSeqAndReserved & 0x3F) | 0x80);
+ _uuid._rfc4122.timeHighAndVersion = static_cast<uint16_t>((_uuid._rfc4122.timeHighAndVersion & 0x0FFF) | 0x4000);
break;
}
@@ -66,12 +66,13 @@ ATSUuid::operator=(const ATSUuid &other)
bool
ATSUuid::parseString(const char *str)
{
- int cnt = sscanf(str, "%08x-%04hx-%04hx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx", &_uuid.timeLow, &_uuid.timeMid,
- &_uuid.timeHighAndVersion, &_uuid.clockSeqAndReserved, &_uuid.clockSeqLow, &_uuid.node[0], &_uuid.node[1],
- &_uuid.node[2], &_uuid.node[3], &_uuid.node[4], &_uuid.node[5]);
+ int cnt = sscanf(str, "%08x-%04hx-%04hx-%02hhx%02hhx-%02hhx%02hhx%02hhx%02hhx%02hhx%02hhx", &_uuid._rfc4122.timeLow,
+ &_uuid._rfc4122.timeMid, &_uuid._rfc4122.timeHighAndVersion, &_uuid._rfc4122.clockSeqAndReserved,
+ &_uuid._rfc4122.clockSeqLow, &_uuid._rfc4122.node[0], &_uuid._rfc4122.node[1], &_uuid._rfc4122.node[2],
+ &_uuid._rfc4122.node[3], &_uuid._rfc4122.node[4], &_uuid._rfc4122.node[5]);
if ((11 == cnt) && _toString(_string)) {
- switch (_uuid.timeHighAndVersion >> 12) {
+ switch (_uuid._rfc4122.timeHighAndVersion >> 12) {
case 1:
_version = TS_UUID_V1;
break;