From cd07d5f3d70824c24a7277bc8726a5e3c28dc174 Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Wed, 16 Sep 2020 22:19:00 -0400
Subject: [PATCH] TrigServices: Fix cppcheck warnings.
- Pass class instances by const reference, not by value.
- assert() with side effects.
- unused value.
---
.../TrigServices/src/TrigMonTHistSvc.cxx | 9 ++------
.../TrigServices/src/TrigMonTHistSvc.h | 2 +-
.../TrigServices/test/test_TrigMessageSvc.cxx | 23 ++++++++++++-------
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
index 26179295503..4946e91fb94 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/
#include "TrigMonTHistSvc.h"
@@ -280,14 +280,9 @@ StatusCode TrigMonTHistSvc::regHist(const std::string& id, std::unique_ptr<TH1>
return regHist_i(std::move(hist), id, false, hid);
}
-StatusCode TrigMonTHistSvc::regHist(const std::string& id, std::unique_ptr<TH1> hist, TH1* hist_ptr)
+StatusCode TrigMonTHistSvc::regHist(const std::string& id, std::unique_ptr<TH1> hist, TH1* /*hist_ptr*/)
{
THistID* hid = nullptr;
- // This is only to support a common use case where the histogram is used after
- // its registration
- if (hist_ptr != nullptr) {
- hist_ptr = hist.get();
- }
return regHist_i(std::move(hist), id, false, hid);
}
diff --git a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
index 595d7ba9955..5770b3c2b93 100644
--- a/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
+++ b/HLT/Trigger/TrigControl/TrigServices/src/TrigMonTHistSvc.h
@@ -121,7 +121,7 @@ public:
private:
/// Helper struct that bundles the histogram, name and mutex
struct THistID {
- THistID(const std::string s, TObject* o) : id(s), obj(o) {};
+ THistID(const std::string& s, TObject* o) : id(s), obj(o) {};
~THistID() { delete mutex; }
std::string id;
TObject* obj{nullptr};
diff --git a/HLT/Trigger/TrigControl/TrigServices/test/test_TrigMessageSvc.cxx b/HLT/Trigger/TrigControl/TrigServices/test/test_TrigMessageSvc.cxx
index e368409425f..19197250209 100644
--- a/HLT/Trigger/TrigControl/TrigServices/test/test_TrigMessageSvc.cxx
+++ b/HLT/Trigger/TrigControl/TrigServices/test/test_TrigMessageSvc.cxx
@@ -45,10 +45,13 @@ int main() {
//--------------------------------------------------
// Initialise and start the services
//--------------------------------------------------
- assert(msgsvc.initialize().isSuccess());
+ StatusCode sc = msgsvc.initialize();
+ assert(sc.isSuccess());
- assert(hsvc->start().isSuccess());
- assert(msgsvc.start().isSuccess());
+ sc = hsvc->start();
+ assert(sc.isSuccess());
+ sc = msgsvc.start();
+ assert(sc.isSuccess());
//--------------------------------------------------
// Prepare the benchmark
@@ -81,11 +84,15 @@ int main() {
//--------------------------------------------------
// Stop and finalise the services
//--------------------------------------------------
- assert(msgsvc.stop().isSuccess());
- assert(hsvc->stop().isSuccess());
-
- assert(msgsvc.finalize().isSuccess());
- assert(hsvc->finalize().isSuccess());
+ sc = msgsvc.stop();
+ assert(sc.isSuccess());
+ sc = hsvc->stop();
+ assert(sc.isSuccess());
+
+ sc = msgsvc.finalize();
+ assert(sc.isSuccess());
+ sc = hsvc->finalize();
+ assert(sc.isSuccess());
return 0;
}
--
GitLab