clang check IOPool

cms-sw · Oct 7, 2017 · f68b362 · f68b362
1 parent 5349f79
commit f68b362
Show file tree

Hide file tree

Showing 19 changed files with 84 additions and 84 deletions.
diff --git a/IOPool/Output/interface/PoolOutputModule.h b/IOPool/Output/interface/PoolOutputModule.h
@@ -40,7 +40,7 @@ namespace edm {
   public:
     enum DropMetaData { DropNone, DropDroppedPrior, DropPrior, DropAll };
     explicit PoolOutputModule(ParameterSet const& ps);
-    virtual ~PoolOutputModule();
+    ~PoolOutputModule() override;
     PoolOutputModule(PoolOutputModule const&) = delete; // Disallow copying and moving
     PoolOutputModule& operator=(PoolOutputModule const&) = delete; // Disallow copying and moving
     std::string const& fileName() const {return fileName_;}
@@ -126,23 +126,23 @@ namespace edm {
 
   protected:
     ///allow inheriting classes to override but still be able to call this method in the overridden version
-    virtual bool shouldWeCloseFile() const override;
-    virtual void write(EventForOutput const& e) override;
+    bool shouldWeCloseFile() const override;
+    void write(EventForOutput const& e) override;
 
     virtual std::pair<std::string, std::string> physicalAndLogicalNameForNewFile();
     virtual void doExtrasAfterCloseFile();
   private:
-    virtual void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const override;
-
-    virtual void openFile(FileBlock const& fb) override;
-    virtual void respondToOpenInputFile(FileBlock const& fb) override;
-    virtual void respondToCloseInputFile(FileBlock const& fb) override;
-    virtual void writeLuminosityBlock(LuminosityBlockForOutput const& lb) override;
-    virtual void writeRun(RunForOutput const& r) override;
-    virtual bool isFileOpen() const override;
+    void preActionBeforeRunEventAsync(WaitingTask* iTask, ModuleCallingContext const& iModuleCallingContext, Principal const& iPrincipal) const override;
+
+    void openFile(FileBlock const& fb) override;
+    void respondToOpenInputFile(FileBlock const& fb) override;
+    void respondToCloseInputFile(FileBlock const& fb) override;
+    void writeLuminosityBlock(LuminosityBlockForOutput const& lb) override;
+    void writeRun(RunForOutput const& r) override;
+    bool isFileOpen() const override;
     void reallyOpenFile();
-    virtual void reallyCloseFile() override;
-    virtual void beginJob() override;
+    void reallyCloseFile() override;
+    void beginJob() override;
 
     typedef std::map<BranchID, std::set<ParentageID> > BranchParents;
     void updateBranchParentsForOneBranch(ProductProvenanceRetriever const* provRetriever,

diff --git a/IOPool/Output/interface/TimeoutPoolOutputModule.h b/IOPool/Output/interface/TimeoutPoolOutputModule.h
@@ -23,15 +23,15 @@ namespace edm {
   class TimeoutPoolOutputModule : public PoolOutputModule {
   public:
     explicit TimeoutPoolOutputModule(ParameterSet const& ps);
-    virtual ~TimeoutPoolOutputModule(){};
+    ~TimeoutPoolOutputModule() override{};
     TimeoutPoolOutputModule(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving
     TimeoutPoolOutputModule& operator=(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving
 
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   protected:
-    virtual bool shouldWeCloseFile() const override;
-    virtual void write(EventForOutput const& e) override;
+    bool shouldWeCloseFile() const override;
+    void write(EventForOutput const& e) override;
 
   private:
     mutable time_t m_lastEvent;

diff --git a/IOPool/Output/src/PoolOutputModule.cc b/IOPool/Output/src/PoolOutputModule.cc
@@ -119,16 +119,16 @@ namespace edm {
         basketSize_(BranchDescription::invalidBasketSize) {}
 
   PoolOutputModule::OutputItem::OutputItem() :
-        branchDescription_(0),
+        branchDescription_(nullptr),
         token_(),
-        product_(0),
+        product_(nullptr),
         splitLevel_(BranchDescription::invalidSplitLevel),
         basketSize_(BranchDescription::invalidBasketSize) {}
 
   PoolOutputModule::OutputItem::OutputItem(BranchDescription const* bd, EDGetToken const& token, int splitLevel, int basketSize) :
         branchDescription_(bd),
         token_(token),
-        product_(0),
+        product_(nullptr),
         splitLevel_(splitLevel),
         basketSize_(basketSize) {}
 
@@ -200,7 +200,7 @@ namespace edm {
       int basketSize = BranchDescription::invalidBasketSize;
 
       BranchDescription const& prod = *kept.first;
-      TBranch* theBranch = ((!prod.produced() && theInputTree != nullptr && !overrideInputFileSplitLevels_) ? theInputTree->GetBranch(prod.branchName().c_str()) : 0);
+      TBranch* theBranch = ((!prod.produced() && theInputTree != nullptr && !overrideInputFileSplitLevels_) ? theInputTree->GetBranch(prod.branchName().c_str()) : nullptr);
 
       if(theBranch != nullptr) {
         splitLevel = theBranch->GetSplitLevel();

diff --git a/IOPool/Output/src/TimeoutPoolOutputModule.cc b/IOPool/Output/src/TimeoutPoolOutputModule.cc
@@ -13,7 +13,7 @@ namespace edm {
   TimeoutPoolOutputModule::TimeoutPoolOutputModule(ParameterSet const& ps):
       edm::one::OutputModuleBase::OutputModuleBase(ps),
       PoolOutputModule(ps), 
-      m_lastEvent(time(NULL)),
+      m_lastEvent(time(nullptr)),
       eventsWrittenInCurrentFile(0),
       m_timeout(-1) // we want the first event right away
   {  }
@@ -26,7 +26,7 @@ namespace edm {
   }
 
   bool TimeoutPoolOutputModule::shouldWeCloseFile() const {
-    time_t now(time(NULL));
+    time_t now(time(nullptr));
     if ( PoolOutputModule::shouldWeCloseFile() ) {
       edm::LogVerbatim("TimeoutPoolOutputModule")  <<" Closing file "<< currentFileName()<< " with "<< eventsWrittenInCurrentFile  <<" events.";
       eventsWrittenInCurrentFile = 0;

diff --git a/IOPool/Streamer/interface/StreamerInputSource.h b/IOPool/Streamer/interface/StreamerInputSource.h
@@ -33,7 +33,7 @@ namespace edm {
   public:  
     explicit StreamerInputSource(ParameterSet const& pset,
                  InputSourceDescription const& desc);
-    virtual ~StreamerInputSource();
+    ~StreamerInputSource() override;
     static void fillDescription(ParameterSetDescription& description);
 
     std::unique_ptr<SendJobHeader> deserializeRegistry(InitMsgView const& initView);
@@ -71,16 +71,16 @@ namespace edm {
     class EventPrincipalHolder : public EDProductGetter {
     public:
       EventPrincipalHolder();
-      virtual ~EventPrincipalHolder();
+      ~EventPrincipalHolder() override;
 
-      virtual WrapperBase const* getIt(ProductID const& id) const override;
-      virtual WrapperBase const* getThinnedProduct(ProductID const&, unsigned int&) const override;
-      virtual void getThinnedProducts(ProductID const& pid,
+      WrapperBase const* getIt(ProductID const& id) const override;
+      WrapperBase const* getThinnedProduct(ProductID const&, unsigned int&) const override;
+      void getThinnedProducts(ProductID const& pid,
                                       std::vector<WrapperBase const*>& wrappers,
                                       std::vector<unsigned int>& keys) const override;
 
 
-      virtual unsigned int transitionIndex_() const override;
+      unsigned int transitionIndex_() const override;
 
       void setEventPrincipal(EventPrincipal* ep);
 
@@ -89,11 +89,11 @@ namespace edm {
       EventPrincipal const* eventPrincipal_;
     };
 
-    virtual void read(EventPrincipal& eventPrincipal);
+    void read(EventPrincipal& eventPrincipal) override;
 
-    virtual void setRun(RunNumber_t r);
+    void setRun(RunNumber_t r) override;
 
-    virtual std::unique_ptr<FileBlock> readFile_();
+    std::unique_ptr<FileBlock> readFile_() override;
 
     edm::propagate_const<TClass*> tc_;
     std::vector<unsigned char> dest_;

diff --git a/IOPool/Streamer/interface/StreamerOutputModule.h b/IOPool/Streamer/interface/StreamerOutputModule.h
@@ -19,16 +19,16 @@ namespace edm {
 
   public:
     explicit StreamerOutputModule(ParameterSet const& ps);  
-    virtual ~StreamerOutputModule();
+    ~StreamerOutputModule() override;
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   private:
-    virtual void start() override;
-    virtual void stop() override;
-    virtual void doOutputHeader(InitMsgBuilder const& init_message) override;
-    virtual void doOutputEvent(EventMsgBuilder const& msg) override;
-    virtual void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
-    virtual void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
+    void start() override;
+    void stop() override;
+    void doOutputHeader(InitMsgBuilder const& init_message) override;
+    void doOutputEvent(EventMsgBuilder const& msg) override;
+    void beginLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
+    void endLuminosityBlock(edm::LuminosityBlockForOutput const&) override;
 
   private:
     edm::propagate_const<std::unique_ptr<Consumer>> c_;

diff --git a/IOPool/Streamer/interface/StreamerOutputModuleBase.h b/IOPool/Streamer/interface/StreamerOutputModuleBase.h
@@ -18,17 +18,17 @@ namespace edm {
   class StreamerOutputModuleBase : public one::OutputModule<one::WatchRuns, one::WatchLuminosityBlocks> {
   public:
     explicit StreamerOutputModuleBase(ParameterSet const& ps);
-    virtual ~StreamerOutputModuleBase();
+    ~StreamerOutputModuleBase() override;
     static void fillDescription(ParameterSetDescription & desc);
 
   private:
-    virtual void beginRun(RunForOutput const&) override;
-    virtual void endRun(RunForOutput const&) override;
-    virtual void beginJob() override;
-    virtual void endJob() override;
-    virtual void writeRun(RunForOutput const&) override;
-    virtual void writeLuminosityBlock(LuminosityBlockForOutput const&) override;
-    virtual void write(EventForOutput const& e) override;
+    void beginRun(RunForOutput const&) override;
+    void endRun(RunForOutput const&) override;
+    void beginJob() override;
+    void endJob() override;
+    void writeRun(RunForOutput const&) override;
+    void writeLuminosityBlock(LuminosityBlockForOutput const&) override;
+    void write(EventForOutput const& e) override;
 
     virtual void start() = 0;
     virtual void stop() = 0;

diff --git a/IOPool/Streamer/src/ClassFiller.cc b/IOPool/Streamer/src/ClassFiller.cc
@@ -22,7 +22,7 @@ namespace edm {
   void doBuildRealData(std::string const& name) {
     FDEBUG(3) << "doing BuildRealData for " << name << "\n";
     TClass* ttest = TClass::GetClass(name.c_str());
-    if (ttest != 0) {
+    if (ttest != nullptr) {
       ttest->BuildRealData();
     } else {
       throw edm::Exception(errors::Configuration)
@@ -52,7 +52,7 @@ namespace edm {
     TClass* getRootClass(std::string const& name) {
       TClass* tc = TClass::GetClass(name.c_str());    
 
-      if(tc == 0) {
+      if(tc == nullptr) {
 	throw edm::Exception(errors::Configuration,"getRootClass")
 	  << "could not find TClass for " << name
 	  << "\n";

diff --git a/IOPool/Streamer/src/DumpTools.cc b/IOPool/Streamer/src/DumpTools.cc
@@ -100,7 +100,7 @@ void dumpInitVerbose(const InitMsgView* view)
                (char*)view->descData(), kFALSE);
   std::unique_ptr<SendJobHeader> sd((SendJobHeader*)xbuf.ReadObjectAny(desc));
 
-  if (sd.get() == 0) {
+  if (sd.get() == nullptr) {
     std::cout << "Unable to determine the product registry - "
               << "Registry deserialization error." << std::endl;
   }

diff --git a/IOPool/Streamer/src/FRDEventMessage.cc b/IOPool/Streamer/src/FRDEventMessage.cc
@@ -16,7 +16,7 @@
  */
 FRDEventMsgView::FRDEventMsgView(void* buf)
   : buf_((uint8*)buf),
-    payload_(0),
+    payload_(nullptr),
     size_(0),
     version_(0),
     run_(0),

diff --git a/IOPool/Streamer/src/InitMessage.cc b/IOPool/Streamer/src/InitMessage.cc
@@ -7,26 +7,26 @@
 InitMsgView::InitMsgView(void* buf) :
   buf_((uint8*)buf),
   head_(buf),
-  release_start_(0),
+  release_start_(nullptr),
   release_len_(0),
-  processName_start_(0),
+  processName_start_(nullptr),
   processName_len_(0),
-  outputModuleLabel_start_(0),
+  outputModuleLabel_start_(nullptr),
   outputModuleLabel_len_(0),
   outputModuleId_(0),
-  hlt_trig_start_(0),
+  hlt_trig_start_(nullptr),
   hlt_trig_count_(0),
   hlt_trig_len_(0),
-  hlt_select_start_(0),
+  hlt_select_start_(nullptr),
   hlt_select_count_(0),
   hlt_select_len_(0),
-  l1_trig_start_(0),
+  l1_trig_start_(nullptr),
   l1_trig_count_(0),
   l1_trig_len_(0),
   adler32_chksum_(0),
-  host_name_start_(0),
+  host_name_start_(nullptr),
   host_name_len_(0),
-  desc_start_(0),
+  desc_start_(nullptr),
   desc_len_(0) {
   if (protocolVersion() == 2) {
       std::cout << "Protocol Version 2 encountered" << std::endl;

diff --git a/IOPool/Streamer/src/StreamerFileIO.cc b/IOPool/Streamer/src/StreamerFileIO.cc
@@ -6,7 +6,7 @@
 
   OutputFile::OutputFile(const std::string& name):
     current_offset_(1), 
-    do_adler_(0),
+    do_adler_(false),
     adlera_(1),
     adlerb_(0),
     ost_(new std::ofstream(name.c_str(), std::ios_base::binary | std::ios_base::out)),
@@ -16,7 +16,7 @@
       throw cms::Exception("OutputFile","OutputFile")
         << "Error Opening Output File: "<<name<<"\n";
     }
-    ost_->rdbuf()->pubsetbuf(0,0);
+    ost_->rdbuf()->pubsetbuf(nullptr,0);
   }
 
   OutputFile::~OutputFile() 
@@ -31,8 +31,8 @@
       current_offset_ += (uint64)(n);
       if (do_adler_)
         cms::Adler32(ptr,n,adlera_,adlerb_);
-      return 0;
+      return false;
     }
-    return 1;
+    return true;
   }
 
diff --git a/IOPool/Streamer/src/StreamerFileReader.h b/IOPool/Streamer/src/StreamerFileReader.h
@@ -21,18 +21,18 @@ namespace edm {
   class StreamerFileReader : public StreamerInputSource {
   public:
     StreamerFileReader(ParameterSet const& pset, InputSourceDescription const& desc);
-    virtual ~StreamerFileReader();
+    ~StreamerFileReader() override;
 
     InitMsgView const* getHeader();
     EventMsgView const* getNextEvent();
     bool newHeader();
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   private:
-    virtual bool checkNextEvent() override;
-    virtual void skip(int toSkip) override;
-    virtual void genuineCloseFile() override;
-    virtual void reset_() override;
+    bool checkNextEvent() override;
+    void skip(int toSkip) override;
+    void genuineCloseFile() override;
+    void reset_() override;
 
     std::shared_ptr<EventSkipperByID const> eventSkipperByID() const {return get_underlying_safe(eventSkipperByID_);}
     std::shared_ptr<EventSkipperByID>& eventSkipperByID() {return get_underlying_safe(eventSkipperByID_);}

diff --git a/IOPool/Streamer/src/StreamerInputFile.cc b/IOPool/Streamer/src/StreamerInputFile.cc
@@ -72,9 +72,9 @@ namespace edm {
     logFileAction("  Initiating request to open file ");
 
     IOOffset size = -1;
-    if(StorageFactory::get()->check(name.c_str(), &size)) {
+    if(StorageFactory::get()->check(name, &size)) {
       try {
-        storage_ =StorageFactory::get()->open(name.c_str(),
+        storage_ =StorageFactory::get()->open(name,
                                                    IOFlags::OpenRead);
       }
       catch(cms::Exception& e) {

diff --git a/IOPool/Streamer/src/StreamerOutputFile.cc b/IOPool/Streamer/src/StreamerOutputFile.cc
@@ -7,7 +7,7 @@
   StreamerOutputFile::StreamerOutputFile(const std::string& name):
   streamerfile_(new OutputFile(name))
   {
-    streamerfile_->set_do_adler(1);
+    streamerfile_->set_do_adler(true);
   }
 
   uint64 StreamerOutputFile::write(const EventMsgBuilder& ineview)

diff --git a/IOPool/Streamer/src/StreamerOutputModuleBase.cc b/IOPool/Streamer/src/StreamerOutputModuleBase.cc
@@ -34,7 +34,7 @@ namespace {
 
   void packIntoString(std::vector<unsigned char> const& source,
                       std::vector<unsigned char>& package) {
-     if (source.size() < 1) {return;}
+     if (source.empty()) {return;}
      unsigned int packInOneByte = 4;
      unsigned int sizeOfPackage = 1+((source.size()-1)/packInOneByte); //Two bits per HLT
 

diff --git a/IOPool/TFileAdaptor/interface/TStorageFactorySystem.h b/IOPool/TFileAdaptor/interface/TStorageFactorySystem.h
@@ -18,18 +18,18 @@ class TStorageFactorySystem : public TSystem
 
   TStorageFactorySystem(const char *, Bool_t); // For compatibility with TXNetFile, we don't actually use the arguments
   TStorageFactorySystem(void);
-  ~TStorageFactorySystem(void);
+  ~TStorageFactorySystem(void) override;
 
-  virtual Int_t		MakeDirectory(const char *name);
-  virtual void *	OpenDirectory(const char *name);
-  virtual void		FreeDirectory(void *dirp);
-  virtual const char *	GetDirEntry(void *dirp);
+  Int_t		MakeDirectory(const char *name) override;
+  void *	OpenDirectory(const char *name) override;
+  void		FreeDirectory(void *dirp) override;
+  const char *	GetDirEntry(void *dirp) override;
 
-  virtual Int_t		GetPathInfo(const char *path, FileStat_t &info);
+  Int_t		GetPathInfo(const char *path, FileStat_t &info) override;
 
-  virtual Bool_t	AccessPathName(const char *path, EAccessMode mode);
+  Bool_t	AccessPathName(const char *path, EAccessMode mode) override;
 
-  virtual int           Unlink(const char *name);
+  int           Unlink(const char *name) override;
 
 };
 

diff --git a/IOPool/TFileAdaptor/src/ReadRepacker.cc b/IOPool/TFileAdaptor/src/ReadRepacker.cc
@@ -1,6 +1,6 @@
 
 #include <cassert>
-#include <string.h>
+#include <cstring>
 
 #include "ReadRepacker.h"