Merge pull request #16 from DUNE-DAQ/wpv_lintfixes

apply lint suggestions
DUNE-DAQ · Jul 23, 2021 · deadbd4 · deadbd4
2 parents 8811051 + 5c51996
commit deadbd4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 20 deletions.
diff --git a/plugins/PacmanCardReader.cpp b/plugins/PacmanCardReader.cpp
@@ -91,11 +91,11 @@ PacmanCardReader::do_configure(const data_t& args)
   m_card_id = m_cfg.card_id;
 
   // Config checks - make some if config values needed, felix example below
-  /*
-  if (m_num_links != m_elinks.size()) {
-    ers::fatal(ElinkConfigurationInconsistency(ERS_HERE, m_num_links));
-  } 
-  */
+  //
+  //if (m_num_links != m_elinks.size()) {
+  //  ers::fatal(ElinkConfigurationInconsistency(ERS_HERE, m_num_links));
+  //} 
+  //
 
   // Configure components
   TLOG(TLVL_WORK_STEPS) << "Configuring ZMQLinkHandler";

diff --git a/src/CreateZMQLink.hpp b/src/CreateZMQLink.hpp
@@ -47,4 +47,4 @@ createZMQLinkModel(const std::string& target)
 } // namespace lbrulibs
 } // namespace dunedaq
 
-#endif // LBRULIBS_SRC_CREATEELINK_HPP_
+#endif // LBRULIBS_SRC_CREATEZMQLINK_HPP_
diff --git a/src/ZMQIssues.hpp b/src/ZMQIssues.hpp
@@ -18,7 +18,7 @@ ERS_DECLARE_ISSUE(lbrulibs, InitializationError, " ZMQ Initialization Error: " <
 
 ERS_DECLARE_ISSUE(lbrulibs, GenericNDMessage, " ND Readout: " << initmsg, ((std::string)initmsg))
 
-ERS_DECLARE_ISSUE(lbrulibs, ReceiveTimeoutExpired, "Unable to receive within timeout period: "  << timeout << " milliseconds.",((int)timeout))
+ERS_DECLARE_ISSUE(lbrulibs, ReceiveTimeoutExpired, "Unable to receive within timeout period: "  << timeout << " milliseconds.",((int)timeout)) // NOLINT
 } // namespace dunedaq
 
 #endif // LBRULIBS_SRC_ZMQISSUES_HPP_
diff --git a/src/ZMQLinkConcept.hpp b/src/ZMQLinkConcept.hpp
@@ -10,10 +10,10 @@
 #ifndef LBRULIBS_SRC_ZMQLINKCONCEPT_HPP_
 #define LBRULIBS_SRC_ZMQLINKCONCEPT_HPP_
 
-#include <nlohmann/json.hpp>
-//#include "ipm/Subscriber.hpp"
 #include "zmq.hpp"
 
+#include <nlohmann/json.hpp>
+
 #include <memory>
 #include <sstream>
 #include <string>

diff --git a/src/ZMQLinkModel.hpp b/src/ZMQLinkModel.hpp
@@ -9,29 +9,24 @@
 #define LBRULIBS_SRC_ZMQLINKMODEL_HPP_
 
 #include "ZMQLinkConcept.hpp"
+#include "zmq.hpp"
 
-#include "readout/utils/ReusableThread.hpp"
 #include "appfwk/DAQSink.hpp"
 #include "logging/Logging.hpp"
 
+#include "readout/utils/ReusableThread.hpp"
+#include "readout/NDReadoutTypes.hpp"
+
 #include <nlohmann/json.hpp>
 #include <folly/ProducerConsumerQueue.h>
 
-//#include "ipm/Subscriber.hpp"
-#include "zmq.hpp"
-#include "readout/NDReadoutTypes.hpp"
-
 #include <string>
 #include <mutex>
 #include <atomic>
 #include <memory>
 
 namespace dunedaq::lbrulibs {
-/*
-ERS_DECLARE_ISSUE(lbrulibs,ReceiveTimeoutExpired,
-                  "Unable to receive within timeout period (timeout period was " << timeout << " milliseconds)",
-                  ((int)timeout)) // NOLINT
-*/
+
 template<class TargetPayloadType>
 class ZMQLinkModel : public ZMQLinkConcept {
 public:
@@ -173,7 +168,7 @@ class ZMQLinkModel : public ZMQLinkConcept {
               TLOG_DEBUG(1) << ": Pushing data into output_queue";
               try {
                 TargetPayloadType* Payload = new TargetPayloadType();
-                std::memcpy((void *)&Payload->data, msg.data(), msg.size());
+                std::memcpy(static_cast<void *>(&Payload->data), msg.data(), msg.size());
 
                 m_sink_queue->push(*Payload, m_sink_timeout);
               } catch (const appfwk::QueueTimeoutExpired& ex) {