From 27452f935d0e0d2c9a129490e64b4ebb38266c6d Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Fri, 26 Jul 2024 10:38:18 -0400 Subject: [PATCH] cleanup some warnings; --- src/common/dmr/data/DataBlock.cpp | 3 --- src/common/lookups/LookupTable.h | 3 ++- src/common/lookups/RadioIdLookup.cpp | 3 ++- src/host/p25/packet/Data.cpp | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/common/dmr/data/DataBlock.cpp b/src/common/dmr/data/DataBlock.cpp index 484dd31d..c13b131a 100644 --- a/src/common/dmr/data/DataBlock.cpp +++ b/src/common/dmr/data/DataBlock.cpp @@ -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; diff --git a/src/common/lookups/LookupTable.h b/src/common/lookups/LookupTable.h index 3c7fe1d1..ce8869a0 100644 --- a/src/common/lookups/LookupTable.h +++ b/src/common/lookups/LookupTable.h @@ -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 (...) { diff --git a/src/common/lookups/RadioIdLookup.cpp b/src/common/lookups/RadioIdLookup.cpp index c9417f99..a9ece825 100644 --- a/src/common/lookups/RadioIdLookup.cpp +++ b/src/common/lookups/RadioIdLookup.cpp @@ -87,7 +87,8 @@ void RadioIdLookup::eraseEntry(uint32_t id) { std::lock_guard 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 */ diff --git a/src/host/p25/packet/Data.cpp b/src/host/p25/packet/Data.cpp index fadd3a2d..e116f0b5 100644 --- a/src/host/p25/packet/Data.cpp +++ b/src/host/p25/packet/Data.cpp @@ -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) {