From c01cd08b86fe6b5ccdee31592c8e7d6f57aa88ee Mon Sep 17 00:00:00 2001 From: Kevin Matz Date: Mon, 2 Aug 2021 10:10:55 -0400 Subject: [PATCH] Clang -Wall -Wextra cleanups --- acn/appliance.cpp | 4 ++-- acn/component.h | 6 +++--- acn/pdu.cpp | 6 +++--- acn/pdu.h | 2 +- dmx/universe.cpp | 4 ++-- platform/qt/qsacnuniverse.h | 6 +++--- sacn/extended.cpp | 6 +++--- sacn/extended.h | 2 +- sacn/receiver.cpp | 2 +- sacn/universe.h | 12 ++++++------ 10 files changed, 25 insertions(+), 25 deletions(-) diff --git a/acn/appliance.cpp b/acn/appliance.cpp index c1e47f4..c8112f7 100644 --- a/acn/appliance.cpp +++ b/acn/appliance.cpp @@ -168,7 +168,7 @@ void Appliance::RlpDerigsterVector() * @brief Appliance::SdtReceiver * @param rlp */ -void Appliance::SdtReceiver(std::shared_ptr rlp) +void Appliance::SdtReceiver(__attribute__((unused)) std::shared_ptr rlp) { /// TODO: handle SDT } @@ -178,7 +178,7 @@ void Appliance::SdtReceiver(std::shared_ptr rlp) * @brief Appliance::DmpReceiver * @param rlp */ -void Appliance::DmpReceiver(std::shared_ptr rlp) +void Appliance::DmpReceiver(__attribute__((unused)) std::shared_ptr rlp) { /// TODO: DMP in root } diff --git a/acn/component.h b/acn/component.h index 328d463..424f08e 100644 --- a/acn/component.h +++ b/acn/component.h @@ -38,9 +38,9 @@ namespace ACN { class Component { public: Component(UUID::uuid cid = UUID::uuid()) - : cid_(cid) - , fctn_(std::string("libESTA ACN Component")) - , uacn_(std::string()) + : fctn_(std::string("libESTA ACN Component")) + , uacn_(std::string()) + , cid_(cid) {}; const UUID::uuid cid() const { return cid_; } diff --git a/acn/pdu.cpp b/acn/pdu.cpp index fcec6c9..334427a 100644 --- a/acn/pdu.cpp +++ b/acn/pdu.cpp @@ -53,7 +53,7 @@ Pdu::~Pdu() * @brief Pdu::vector * @return */ -const uint32_t Pdu::vector() +uint32_t Pdu::vector() { if (flags_.hasVector) return vector_; @@ -172,7 +172,7 @@ void Pdu::iStream(Stream stream) // length includes the flags, length, and vector. // the remainder of the length of header and data - int hd_length = length - (flags_.hasLength ? 3 : 2) - vector_size_; + uint hd_length = length - (flags_.hasLength ? 3 : 2) - vector_size_; // abort if the remaining PDU length isn't available if (!stream->good() || stream->available() < hd_length) { @@ -188,7 +188,7 @@ void Pdu::iStream(Stream stream) } // fast-forward the input stream - for (int i = 0; i < hd_length; i++) + for (uint i = 0; i < hd_length; i++) stream->get(); if (!stream->available()) stream->setstate(std::ios_base::eofbit); diff --git a/acn/pdu.h b/acn/pdu.h index 5a19b10..493b7c4 100644 --- a/acn/pdu.h +++ b/acn/pdu.h @@ -85,7 +85,7 @@ public: ~Pdu(); // getters - const uint32_t vector(); // may inherit + uint32_t vector(); // may inherit pdu_header * header(); // may inherit pdu_data * data(); // may inherit std::shared_ptr parent() {return parent_;} diff --git a/dmx/universe.cpp b/dmx/universe.cpp index d84b503..285c52e 100644 --- a/dmx/universe.cpp +++ b/dmx/universe.cpp @@ -50,7 +50,7 @@ Universe::~Universe() @param uint16_t address of the requested slot. @return const uint8_t value of the slot. */ -const uint8_t Universe::slot (const uint16_t address) const +uint8_t Universe::slot(const uint16_t address) const { if (address == 0) return 0; if (address > null_start_data_.size() - 1) return 0; @@ -65,7 +65,7 @@ const uint8_t Universe::slot (const uint16_t address) const * Calculated as the rolling mean of (the number of frames in * the last 2.5 seconds) / 2.5 seconds. */ -const double Universe::rxRate() +double Universe::rxRate() { rx_timeout_(); return rx_times_.size() / 2.5; diff --git a/platform/qt/qsacnuniverse.h b/platform/qt/qsacnuniverse.h index 147c0b9..223f278 100644 --- a/platform/qt/qsacnuniverse.h +++ b/platform/qt/qsacnuniverse.h @@ -27,17 +27,17 @@ public: return QString::fromUtf8(universe_->source()->description().c_str()); } - const uint16_t number() const + uint16_t number() const { return universe_->source()->universe(); } - const uint8_t priority() const + uint8_t priority() const { return universe_->source()->priority(); } - const double rxRate() const + double rxRate() const { return universe_->rxRate(); } diff --git a/sacn/extended.cpp b/sacn/extended.cpp index de832a6..69b12ee 100644 --- a/sacn/extended.cpp +++ b/sacn/extended.cpp @@ -58,7 +58,7 @@ void frame_sync_header::iStream(PDU::Stream stream) * @brief frame_sync_header::oStream * @return */ -void frame_sync_header::oStream(PDU::Stream stream) const +void frame_sync_header::oStream(__attribute__((unused)) PDU::Stream stream) const { /// TODO: write header to stream } @@ -94,7 +94,7 @@ void frame_discovery_header::iStream(PDU::Stream stream) * @brief frame_discovery_header::oStream * @return */ -void frame_discovery_header::oStream(PDU::Stream stream) const +void frame_discovery_header::oStream(__attribute__((unused)) PDU::Stream stream) const { /// TODO: write header to stream } @@ -162,7 +162,7 @@ void discovery_list_header::iStream(PDU::Stream stream) * @brief discovery_list_header::oStream * @return */ -void discovery_list_header::oStream(PDU::Stream stream) const +void discovery_list_header::oStream(__attribute__((unused)) PDU::Stream stream) const { /// TODO: write header to stream } diff --git a/sacn/extended.h b/sacn/extended.h index 8dc45fe..68c0ff3 100644 --- a/sacn/extended.h +++ b/sacn/extended.h @@ -104,7 +104,7 @@ public: const UUID::uuid cid() const {return cid_;}; const std::string description() const {return description_;} - const uint16_t universe() const {return universe_;} + uint16_t universe() const {return universe_;} private: UUID::uuid cid_; diff --git a/sacn/receiver.cpp b/sacn/receiver.cpp index 3e35be7..0666bd6 100644 --- a/sacn/receiver.cpp +++ b/sacn/receiver.cpp @@ -266,7 +266,7 @@ void Receiver::dataFrameHandler(std::shared_ptr frame) { * @brief Receiver::syncFrameHandler * @param frame */ -void Receiver::syncFrameHandler(std::shared_ptr frame) +void Receiver::syncFrameHandler(__attribute__((unused)) std::shared_ptr frame) { /// TODO: Universe sync } diff --git a/sacn/universe.h b/sacn/universe.h index 4df4a35..e11d20a 100644 --- a/sacn/universe.h +++ b/sacn/universe.h @@ -43,14 +43,14 @@ public: const UUID::uuid CID() const {return cid_;}; const std::string description() const {return description_;} - const uint16_t universe() const {return universe_;} - const uint8_t priority() const {return priority_;} - const uint16_t syncAddress() const {return sync_address_;} - const bool isTerminated() const {return options_ + uint16_t universe() const {return universe_;} + uint8_t priority() const {return priority_;} + uint16_t syncAddress() const {return sync_address_;} + bool isTerminated() const {return options_ & DATA::STREAM_TERMINATED;} - const bool isPreview() const {return options_ + bool isPreview() const {return options_ & DATA::PREVIEW_DATA;} - const bool isForced() const {return options_ + bool isForced() const {return options_ & DATA::FORCE_SYNCHRONIZATION;} friend bool operator== (const UniverseSource& a, const UniverseSource& b);