qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QProtobufPropertyOrdering: remove dead code for char_data alignment check 

Coverity rightfully complained about dead code in the char_data
method, as ... % alignof(char) will never be non zero.

Fix this by removing the superfluous check.

As a drive-by remove unused parameters - they can be added if needed.

Coverity-Id: 479414
Pick-to: 6.9 6.8
Change-Id: Ie3f2b14cbf3e18c76deae491c099ccf7ec8b7716
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
Dennis Oberst 2025-03-27 16:08:19 +01:00
parent 74ed4c3437
commit 4710cacf13
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/protobuf/qprotobufpropertyordering.cpp
View File

@ -70,7 +70,8 @@ private:
}; };
Q_GLOBAL_STATIC(ProtobufOrderingRegistry, orderingRegistry) Q_GLOBAL_STATIC(ProtobufOrderingRegistry, orderingRegistry)
}
} // namespace
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -144,9 +145,14 @@ FieldFlags QProtobufPropertyOrdering::fieldFlags(int index) const
return FieldFlags { int(uint_dataForIndex(index, data->flagsOffset)) }; return FieldFlags { int(uint_dataForIndex(index, data->flagsOffset)) };
} }
uint *QProtobufPropertyOrdering::uint_data(NonConstTag _) const /*!
\internal
Access the generated uint* metadata of message properties.
[ Data, uint_data , char_data ] > Message_metadata
[ . . , ^ x x x x , . . . . . ]
*/
uint *QProtobufPropertyOrdering::uint_data(NonConstTag /*unused*/) const
{ {
Q_UNUSED(_);
Q_ASSERT(data); Q_ASSERT(data);
Q_ASSERT(data->version == 0); Q_ASSERT(data->version == 0);
quintptr dataPtr = quintptr(data); quintptr dataPtr = quintptr(data);
@ -165,17 +171,19 @@ const uint *QProtobufPropertyOrdering::uint_data() const
return uint_data(NonConstTag{}); return uint_data(NonConstTag{});
} }
char *QProtobufPropertyOrdering::char_data(NonConstTag _) const /*!
\internal
Access the generated char* metadata of message properties.
[ Data, uint_data , char_data ] > Message_metadata
[ . . , . . . . . , ^ x x x x ]
*/
char *QProtobufPropertyOrdering::char_data(NonConstTag /*unused*/) const
{ {
Q_UNUSED(_);
Q_ASSERT(data); Q_ASSERT(data);
const uint LastOffset = data->flagsOffset; uint* uintDataPtr = uint_data(NonConstTag{});
uint *u_data = uint_data(NonConstTag{}) + LastOffset + data->numFields; // char_data starts after the last field flag (flagsOffset + numFields)
quintptr uptr_data = quintptr(u_data); uint charDataOffset = data->flagsOffset + data->numFields;
if (size_t(uptr_data) % alignof(char) != 0) return reinterpret_cast<char *>(uintDataPtr + charDataOffset);
uptr_data += alignof(char) - size_t(uptr_data) % alignof(char);
char *c_data = reinterpret_cast<char *>(uptr_data);
return c_data;
} }
const char *QProtobufPropertyOrdering::char_data() const const char *QProtobufPropertyOrdering::char_data() const