Skip to content
Snippets Groups Projects
Commit 5ffee75c authored by Hisaya Kurashige's avatar Hisaya Kurashige Committed by Graeme Stewart
Browse files

Fix Coverity defects (MuonTGC_Cabling-00-02-11)

        * Tagged as MuonTGC_Cabling-00-02-11
        * Fixed Coverity defects : 11465 11466 11522 11523

2015-01-22  Hisaya Kurashige <Hisaya.Kurashige@cern.ch>
        * Tagged as MuonTGC_Cabling-00-02-10
        * fixing memory leak  (see ATR-9839)

2015-01-18 Jochen Meyer
	* Tagged as MuonTGC_Cabling-00-02-09
	* addressing coverity defects 11257-60

	* Tagged as MuonTGC_Cabling-00-02-08
	* fixing coverity defect 11920
parent 5f1c70e6
No related branches found
No related tags found
No related merge requests found
Showing
with 85 additions and 4 deletions
......@@ -19,13 +19,15 @@ class TGCCableSSWToROD : public TGCCable
public:
// Constructor & Destructor
TGCCableSSWToROD(std::string filename);
TGCCableSSWToROD (const TGCCableSSWToROD&);
TGCCableSSWToROD& operator=(const TGCCableSSWToROD&);
virtual ~TGCCableSSWToROD(void);
virtual TGCModuleMap* getModule(const TGCModuleId* moduleId) const;
private:
TGCCableSSWToROD(void) {}
TGCCableSSWToROD(void);
virtual TGCModuleMap* getModuleIn(const TGCModuleId* rod) const;
virtual TGCModuleMap* getModuleOut(const TGCModuleId* ssw) const;
TGCDatabase* database;
......
......@@ -33,7 +33,13 @@ class TGCModuleSLB;
class TGCCabling : public TGCCablingBase
{
public:
private: //hide default constructor, copy constructor and assignment
TGCCabling (void);
TGCCabling (const TGCCabling&);
TGCCabling& operator= (const TGCCabling&);
public:
// Constructor & Destructor
TGCCabling(std::string filenameASDToPP,
std::string filenameInPP,
......@@ -179,7 +185,6 @@ private:
TGCCableHPBToSL* cableHPBToSL;
TGCCableSLBToSSW* cableSLBToSSW;
TGCCableSSWToROD* cableSSWToROD;
TGCCabling(void) {}
mutable std::map<int, TGCModuleId*> m_slbModuleIdMap;
int getIndexFromReadoutWithoutChannel(const TGCIdBase::SideType side,
......
......@@ -100,6 +100,9 @@ private:
/** This bool variable is used to know the database is common or sector specific */
bool m_isCommon;
/** hidden assignment operator */
TGCDatabaseASDToPP & operator=(const TGCDatabaseASDToPP &right);
};
} // end of namespace
......
......@@ -67,6 +67,9 @@ private:
int NIndexDBIn;
int maxIndexIn[NIndexIn];
int minIndexIn[NIndexIn];
/** hidden assignment operator */
TGCDatabaseInPP & operator=(const TGCDatabaseInPP &right);
};
} // end of namespace
......
......@@ -27,6 +27,9 @@ public:
private:
virtual void readDB(void);
TGCDatabasePPToSL(void) {}
/** hidden assignment operator */
TGCDatabasePPToSL & operator=(const TGCDatabasePPToSL &right);
};
} // end of namespace
......
......@@ -28,6 +28,9 @@ public:
private:
virtual void readDB(void);
TGCDatabaseSLBToROD(void) {}
/** hidden assignment operator */
TGCDatabaseSLBToROD & operator=(const TGCDatabaseSLBToROD &right);
};
} // end of namespace
......
......@@ -859,7 +859,10 @@ bool MuonTGC_CablingSvc::getOfflineIDfromOnlineID(Identifier & offlineId,
case 21:
// T11S
channel -= OffsetForT11S;
if(channel<=0) return false;
if(channel<=0) {
delete asdin;
return false;
}
break;
default:
break;
......
......@@ -17,6 +17,28 @@ TGCCableSSWToROD::TGCCableSSWToROD(std::string filename)
{
database = new TGCDatabaseSLBToROD(filename,"SSW ALL");
}
TGCCableSSWToROD::TGCCableSSWToROD (void)
: TGCCable(TGCCable::SSWToROD),
database(0)
{
}
TGCCableSSWToROD::TGCCableSSWToROD (const TGCCableSSWToROD& right)
: TGCCable(TGCCable::SSWToROD),
database(0)
{
database = new TGCDatabaseSLBToROD(*dynamic_cast<TGCDatabaseSLBToROD*>(right.database));
}
TGCCableSSWToROD& TGCCableSSWToROD::operator=(const TGCCableSSWToROD& right)
{
if (this != &right) {
delete database;
database = new TGCDatabaseSLBToROD(*dynamic_cast<TGCDatabaseSLBToROD*>(right.database));
}
return *this;
}
TGCCableSSWToROD::~TGCCableSSWToROD(void)
{
......
......@@ -25,6 +25,43 @@
namespace MuonTGC_Cabling {
// Constructor & Destructor
TGCCabling::TGCCabling (void)
: TGCCablingBase(),
cableInASD(0),
cableASDToPP(0),
cableInPP(0),
cablePPToSLB(0),
cableInSLB(0),
cableSLBToHPB(0),
cableHPBToSL(0),
cableSLBToSSW(0),
cableSSWToROD(0)
{
// do nothing
}
TGCCabling::TGCCabling (const TGCCabling&)
: TGCCablingBase(),
cableInASD(0),
cableASDToPP(0),
cableInPP(0),
cablePPToSLB(0),
cableInSLB(0),
cableSLBToHPB(0),
cableHPBToSL(0),
cableSLBToSSW(0),
cableSSWToROD(0)
{
// do nothing
}
TGCCabling& TGCCabling::operator= (const TGCCabling&)
{
// do nothing
return *this;
}
TGCCabling::TGCCabling(std::string filenameASDToPP,
std::string filenameInPP,
std::string filenamePPToSL,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment