cleanup some warnings;

pull/65/head
Bryan Biedenkapp 2 years ago
parent 34855aed70
commit 27452f935d

@ -100,9 +100,6 @@ bool DataBlock::decode(const uint8_t* data, const DataHeader& header)
::memset(crcBuffer, 0x00U, DMR_PDU_UNCODED_LENGTH_BYTES);
// generate CRC buffer
uint32_t bufferLen = DMR_PDU_CONFIRMED_DATA_LENGTH_BYTES;
if (m_dataType == DataType::RATE_12_DATA)
bufferLen = DMR_PDU_UNCONFIRMED_LENGTH_BYTES;
uint32_t crcBitLength = 144U;
if (m_dataType == DataType::RATE_12_DATA)
crcBitLength = 96U;

@ -141,7 +141,8 @@ namespace lookups
virtual bool hasEntry(uint32_t id)
{
try {
m_table.at(id);
T entry = m_table.at(id); // this value will get discarded
(void)entry; // but some variants of C++ mark the unordered_map<>::at as nodiscard
return true;
}
catch (...) {

@ -87,7 +87,8 @@ void RadioIdLookup::eraseEntry(uint32_t id)
{
std::lock_guard<std::mutex> lock(m_mutex);
try {
m_table.at(id);
RadioId entry = m_table.at(id); // this value will get discarded
(void)entry; // but some variants of C++ mark the unordered_map<>::at as nodiscard
m_table.erase(id);
} catch (...) {
/* stub */

@ -410,7 +410,7 @@ bool Data::process(uint8_t* data, uint32_t len)
uint16_t opcode = __GET_UINT16B(arpPacket, 6U);
uint32_t srcHWAddr = __GET_UINT16(arpPacket, 8U);
uint32_t srcProtoAddr = __GET_UINT32(arpPacket, 11U);
uint32_t tgtHWAddr = __GET_UINT16(arpPacket, 15U);
//uint32_t tgtHWAddr = __GET_UINT16(arpPacket, 15U);
uint32_t tgtProtoAddr = __GET_UINT32(arpPacket, 18U);
if (m_verbose) {
@ -755,7 +755,7 @@ bool Data::processNetwork(uint8_t* data, uint32_t len, uint32_t blockLength)
uint16_t opcode = __GET_UINT16B(arpPacket, 6U);
uint32_t srcHWAddr = __GET_UINT16(arpPacket, 8U);
uint32_t srcProtoAddr = __GET_UINT32(arpPacket, 11U);
uint32_t tgtHWAddr = __GET_UINT16(arpPacket, 15U);
//uint32_t tgtHWAddr = __GET_UINT16(arpPacket, 15U);
uint32_t tgtProtoAddr = __GET_UINT32(arpPacket, 18U);
if (m_verbose) {

Loading…
Cancel
Save

Powered by TurnKey Linux.