Skip to content
Snippets Groups Projects
Commit 37a59a7a authored by scott snyder's avatar scott snyder Committed by scott snyder
Browse files

ByteStreamCnvSvcLegacy: Fix cppcheck warnings.

 - Prohibit copying of class owning memory.
 - Pass class instances by const reference, not by value.
parent a1aeca78
No related branches found
No related tags found
No related merge requests found
...@@ -56,39 +56,39 @@ public: ...@@ -56,39 +56,39 @@ public:
\param compression Compression type \param compression Compression type
\param compLevel Compression level \param compLevel Compression level
*/ */
DataWriter(const std::string writingPath, DataWriter(const std::string& writingPath,
const std::string fileNameCore, const std::string& fileNameCore,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const unsigned int startIndex = 1, const unsigned int startIndex = 1,
const CompressionType compression = NONE, const CompressionType compression = NONE,
const unsigned int compLevel = 1); const unsigned int compLevel = 1);
DataWriter(const std::string writingPath, DataWriter(const std::string& writingPath,
boost::shared_ptr<EventStorage::FileNameCallback> theFNCB, boost::shared_ptr<EventStorage::FileNameCallback> theFNCB,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::string project, const std::string& project,
const std::string streamType, const std::string& streamType,
const std::string streamName, const std::string& streamName,
const std::string stream, const std::string& stream,
const unsigned int lumiBlockNumber, const unsigned int lumiBlockNumber,
const std::string applicationName, const std::string& applicationName,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const CompressionType compression = NONE, const CompressionType compression = NONE,
const unsigned int compLevel = 1); const unsigned int compLevel = 1);
DataWriter(const std::string writingPath, DataWriter(const std::string& writingPath,
const std::string fileNameCore, const std::string& fileNameCore,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::string project, const std::string& project,
const std::string streamType, const std::string& streamType,
const std::string streamName, const std::string& streamName,
const std::string stream, const std::string& stream,
const unsigned int lumiBlockNumber, const unsigned int lumiBlockNumber,
const std::string applicationName, const std::string& applicationName,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const CompressionType compression = NONE, const CompressionType compression = NONE,
const unsigned int compLevel = 1); const unsigned int compLevel = 1);
...@@ -97,16 +97,16 @@ private: ...@@ -97,16 +97,16 @@ private:
DataWriter(); DataWriter();
void initDW(const std::string writingPath, void initDW(const std::string& writingPath,
boost::shared_ptr<EventStorage::FileNameCallback> theFNCB, boost::shared_ptr<EventStorage::FileNameCallback> theFNCB,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::string project, const std::string& project,
const std::string streamType, const std::string& streamType,
const std::string streamName, const std::string& streamName,
const std::string stream, const std::string& stream,
const unsigned int lumiBlockNumber, const unsigned int lumiBlockNumber,
const std::string applicationName, const std::string& applicationName,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const CompressionType compression, const CompressionType compression,
const unsigned int compLevel); const unsigned int compLevel);
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
...@@ -21,6 +21,9 @@ public: ...@@ -21,6 +21,9 @@ public:
m_buffer = new char[size]; m_buffer = new char[size];
m_buffersize = size; m_buffersize = size;
} }
implementation (const implementation&) = delete;
implementation& operator= (const implementation&) = delete;
~implementation() ~implementation()
{ delete[] m_buffer; } { delete[] m_buffer; }
......
...@@ -32,16 +32,16 @@ using EventStorage::SimpleFileName; ...@@ -32,16 +32,16 @@ using EventStorage::SimpleFileName;
// constructors // constructors
DataWriter:: DataWriter::
DataWriter(const string writingPath, DataWriter(const string& writingPath,
boost::shared_ptr<FileNameCallback> theFNCB, boost::shared_ptr<FileNameCallback> theFNCB,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::string project, const std::string& project,
const std::string streamType, const std::string& streamType,
const std::string streamName, const std::string& streamName,
const std::string stream, const std::string& stream,
const unsigned int lumiBlockNumber, const unsigned int lumiBlockNumber,
const std::string applicationName, const std::string& applicationName,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const CompressionType compression, const CompressionType compression,
const unsigned int compLevel) const unsigned int compLevel)
{ {
...@@ -50,10 +50,10 @@ DataWriter(const string writingPath, ...@@ -50,10 +50,10 @@ DataWriter(const string writingPath,
} }
DataWriter:: DataWriter::
DataWriter(const string writingPath, DataWriter(const string& writingPath,
const string fileNameCore, const string& fileNameCore,
const run_parameters_record rPar, const run_parameters_record& rPar,
const freeMetaDataStrings fmdStrings, const freeMetaDataStrings& fmdStrings,
const unsigned int startIndex, const unsigned int startIndex,
const CompressionType compression, const CompressionType compression,
const unsigned int compLevel) const unsigned int compLevel)
...@@ -95,16 +95,16 @@ DataWriter(const string writingPath, ...@@ -95,16 +95,16 @@ DataWriter(const string writingPath,
DataWriter:: DataWriter::
DataWriter(const string writingPath, DataWriter(const string& writingPath,
const string fileNameCore, const string& fileNameCore,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::string project, const std::string& project,
const std::string streamType, const std::string& streamType,
const std::string streamName, const std::string& streamName,
const std::string stream, const std::string& stream,
const unsigned int lumiBlockNumber, const unsigned int lumiBlockNumber,
const std::string applicationName, const std::string& applicationName,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const CompressionType compression, const CompressionType compression,
const unsigned int compLevel) const unsigned int compLevel)
{ {
...@@ -128,16 +128,16 @@ DataWriter::~DataWriter() ...@@ -128,16 +128,16 @@ DataWriter::~DataWriter()
void DataWriter:: void DataWriter::
initDW(const string writingPath, initDW(const string& writingPath,
boost::shared_ptr<FileNameCallback> theFNCB, boost::shared_ptr<FileNameCallback> theFNCB,
const run_parameters_record rPar, const run_parameters_record& rPar,
const std::string project, const std::string& project,
const std::string streamType, const std::string& streamType,
const std::string streamName, const std::string& streamName,
const std::string stream, const std::string& stream,
const unsigned int lumiBlockNumber, const unsigned int lumiBlockNumber,
const std::string applicationName, const std::string& applicationName,
const std::vector<std::string> fmdStrings, const std::vector<std::string>& fmdStrings,
const CompressionType compression, const CompressionType compression,
const unsigned int compLevel) const unsigned int compLevel)
{ {
......
/* /*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
// This is a warapper class for uuid. // This is a warapper class for uuid.
...@@ -53,10 +53,9 @@ namespace offline_poolCopy_v5 { ...@@ -53,10 +53,9 @@ namespace offline_poolCopy_v5 {
Data1 = g.Data1; Data1 = g.Data1;
Data2 = g.Data2; Data2 = g.Data2;
Data3 = g.Data3; Data3 = g.Data3;
unsigned int *p = (unsigned int*)&Data4[0]; for (size_t i = 0; i < 8; i++) {
const unsigned int *q = (const unsigned int*)&g.Data4[0]; Data4[i] = g.Data4[i];
*(p+1) = *(q+1); }
*p = *q;
} }
return *this; return *this;
} }
......
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