Skip to content

Commit cc970f2

Browse files
authored
Merge pull request #46321 from smuzaffar/reconstruction-clang-ana-warn2
[RECONSTRUCTION] [Clang]Cleanup clang-analyzer warnings
2 parents 149a02b + f0890a1 commit cc970f2

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

MagneticField/ParametrizedEngine/src/BFit3D.cc

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ using namespace magfieldparam;
99

1010
//_______________________________________________________________________________
1111
void BFit3D::SetCoeff_Linear(const double B) {
12-
unsigned jj, kk = 1;
12+
unsigned jj;
1313
double w_0, w_1, B_mod = fabs(B);
1414
if (B_mod <= B_nom[0]) {
1515
w_0 = B / B_nom[0];
@@ -22,6 +22,8 @@ void BFit3D::SetCoeff_Linear(const double B) {
2222
C[jj] = w_0 * C0[jj][3];
2323
}
2424
} else {
25+
unsigned kk = 1;
26+
[[clang::suppress]]
2527
while (B_nom[kk] < B_mod)
2628
++kk; //Simple linear search
2729
w_1 = (B_mod - B_nom[kk - 1]) / (B_nom[kk] - B_nom[kk - 1]);
@@ -38,7 +40,7 @@ void BFit3D::SetCoeff_Linear(const double B) {
3840

3941
//_______________________________________________________________________________
4042
void BFit3D::SetCoeff_Spline(const double B) {
41-
int jc, k0 = 0, k1 = 1;
43+
int jc;
4244
double dB2, dB = fabs(B);
4345
if (dB >= B_nom[3]) { //Linear extrapolation for a large field
4446
dB -= B_nom[3];
@@ -50,9 +52,11 @@ void BFit3D::SetCoeff_Spline(const double B) {
5052
for (jc = 0; jc < 360; ++jc)
5153
C[jc] = (C2[jc][0] * dB2 + C1[jc][0]) * dB;
5254
} else {
55+
int k1 = 1;
56+
[[clang::suppress]]
5357
while (B_nom[k1] < dB)
5458
++k1; //Simple linear search
55-
k0 = k1 - 1;
59+
int k0 = k1 - 1;
5660
dB2 = (dB -= B_nom[k0]) / (3. * (B_nom[k1] - B_nom[k0]));
5761
if (k1 < 3) { //"Regular" interval
5862
for (jc = 0; jc < 360; ++jc)

RecoJets/JetProducers/plugins/VirtualJetProducer.cc

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ void VirtualJetProducer::writeJets(edm::Event& iEvent, edm::EventSetup const& iS
686686
// Distance between jet centers and overlap area -- for disk-based area calculation
687687
using RIJ = std::pair<double, double>;
688688
std::vector<RIJ> rijStorage(fjJets_.size() * (fjJets_.size() / 2));
689-
RIJ* rij[fjJets_.size()];
689+
std::vector<RIJ*> rij(fjJets_.size());
690690
unsigned int k = 0;
691691
for (unsigned int ijet = 0; ijet < fjJets_.size(); ++ijet) {
692692
rij[ijet] = &rijStorage[k];
@@ -752,11 +752,10 @@ void VirtualJetProducer::writeJets(edm::Event& iEvent, edm::EventSetup const& iS
752752
// Here it is assumed that fjJets_ is in decreasing order of pT,
753753
// which should happen in FastjetJetProducer::runAlgorithm()
754754
jetArea = M_PI;
755-
//rij is properly initialized above
756-
[[clang::suppress]]
757755
RIJ* distance = rij[ijet];
758756
for (unsigned jJet = 0; jJet < ijet; ++jJet) {
759-
distance[jJet].first = std::sqrt(reco::deltaR2(etaJ[ijet], phiJ[ijet], etaJ[jJet], phiJ[jJet])) * orParam_;
757+
[[clang::suppress]] distance[jJet].first =
758+
std::sqrt(reco::deltaR2(etaJ[ijet], phiJ[ijet], etaJ[jJet], phiJ[jJet])) * orParam_;
760759
distance[jJet].second = reco::helper::VirtualJetProducerHelper::intersection(distance[jJet].first);
761760
jetArea -= distance[jJet].second;
762761
for (unsigned kJet = 0; kJet < jJet; ++kJet) {

RecoLuminosity/TCPReceiver/src/TCPReceiver.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <netdb.h>
2929

3030
#include <cstring>
31+
#include <cassert>
3132

3233
namespace HCAL_HLX {
3334

@@ -121,7 +122,7 @@ namespace HCAL_HLX {
121122
memset(BigBuffer, 0, bytesToReceive);
122123

123124
usleep(10000);
124-
125+
assert(tcpSocket >= 0);
125126
while ((totalBytesRcvd < bytesToReceive) && (errorCode == 0)) {
126127
SetupFDSets(fdsRead, fdsWrite, fdsExcept, -1, tcpSocket);
127128

RecoTracker/MkFitCore/src/MatriplexPackers.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ namespace mkfit {
9494

9595
template <typename TMerr, typename TMpar>
9696
void pack(TMerr& err, TMpar& par) {
97+
assert(this->m_base);
9798
assert(this->m_pos > 0 && this->m_pos <= NN);
9899

99100
#if defined(GATHER_INTRINSICS)

0 commit comments

Comments
 (0)