address cppcheck warnings

Change-Id: Idffcdf4528b59dd6bf9c4c35db6957b472ccc67b

Author: rdementi

src/cpucounters.cpp

@@ -4641,7 +4641,7 @@ std::string PCM::getCPUFamilyModelString(const uint32 cpu_family_, const uint32
 {
     char buffer[sizeof(int)*4*3+6];
     std::fill(buffer, buffer + sizeof(buffer), 0);
-    std::snprintf(buffer,sizeof(buffer),"GenuineIntel-%d-%2X-%X", cpu_family_, internal_cpu_model_, cpu_stepping_);
+    std::snprintf(buffer,sizeof(buffer),"GenuineIntel-%u-%2X-%X", cpu_family_, internal_cpu_model_, cpu_stepping_);
     std::string result(buffer);
     return result;
 }

src/cpucounters.h

@@ -1596,6 +1596,7 @@ class PCM_API PCM
     typedef std::pair<std::shared_ptr<MMIORange>, uint32> MMIORegisterEncoding; // MMIORange shared ptr, offset
     struct MMIORegisterEncodingHash : public PCICFGRegisterEncodingHash
     {
+        // cppcheck-suppress duplInheritedMember
         std::size_t operator()(const RawEventEncoding& e) const
         {
             std::size_t h4 = std::hash<uint64>{}(e[MMIOEventPosition::membar_bits1]);
@@ -1605,6 +1606,7 @@ class PCM_API PCM
     };
     struct MMIORegisterEncodingCmp : public PCICFGRegisterEncodingCmp
     {
+        // cppcheck-suppress duplInheritedMember
         bool operator ()(const RawEventEncoding& a, const RawEventEncoding& b) const
         {
             return PCICFGRegisterEncodingCmp::operator()(a,b)
@@ -3927,20 +3929,23 @@ class SocketCounterState : public BasicCounterState, public UncoreCounterState
     friend class PCM;
 
 protected:
+    // cppcheck-suppress duplInheritedMember
     void readAndAggregate(std::shared_ptr<SafeMsrHandle> handle)
     {
         BasicCounterState::readAndAggregate(handle);
         UncoreCounterState::readAndAggregate(handle);
     }
 
 public:
+    // cppcheck-suppress duplInheritedMember
     SocketCounterState& operator += ( const BasicCounterState& ccs )
     {
         BasicCounterState::operator += ( ccs );
 
         return *this;
     }
 
+    // cppcheck-suppress duplInheritedMember
     SocketCounterState& operator += ( const UncoreCounterState& ucs )
     {
         UncoreCounterState::operator += ( ucs );
@@ -3953,6 +3958,7 @@ class SocketCounterState : public BasicCounterState, public UncoreCounterState
     SocketCounterState( SocketCounterState&& ) = default;
     SocketCounterState & operator = ( SocketCounterState&& ) = default;
 
+    // cppcheck-suppress duplInheritedMember
     SocketCounterState & operator = ( UncoreCounterState&& ucs ) {
         UncoreCounterState::operator = ( std::move(ucs) );
         return *this;
@@ -3983,6 +3989,7 @@ class SystemCounterState : public SocketCounterState
     std::unordered_map<PCM::RawEventEncoding, std::vector<uint64>, PCM::PMTRegisterEncodingHash2> PMTValues{};
 
 protected:
+    // cppcheck-suppress duplInheritedMember
     void readAndAggregate(std::shared_ptr<SafeMsrHandle> handle)
     {
         BasicCounterState::readAndAggregate(handle);
@@ -4022,6 +4029,7 @@ class SystemCounterState : public SocketCounterState
     SystemCounterState( SystemCounterState&& ) = default;
     SystemCounterState & operator = ( SystemCounterState&& ) = default;
 
+    // cppcheck-suppress duplInheritedMember
     SystemCounterState & operator += ( const SocketCounterState& scs )
     {
         BasicCounterState::operator += ( scs );
@@ -4030,6 +4038,7 @@ class SystemCounterState : public SocketCounterState
         return *this;
     }
 
+    // cppcheck-suppress duplInheritedMember
     SystemCounterState & operator += ( const UncoreCounterState& ucs )
     {
         UncoreCounterState::operator += ( ucs );

src/msr.cpp

@@ -165,7 +165,7 @@ uint32 MsrHandle::decrementNumInstances()
 MsrHandle::MsrHandle(uint32 cpu) : fd(-1), cpu_id(cpu)
 {
     char path[200];
-    snprintf(path, 200, "/dev/cpuctl%d", cpu);
+    snprintf(path, 200, "/dev/cpuctl%u", cpu);
     int handle = ::open(path, O_RDWR);
     if (handle < 0) throw std::exception();
     fd = handle;
@@ -228,11 +228,11 @@ MsrHandle::MsrHandle(uint32 cpu) : fd(-1), cpu_id(cpu)
     }
     char * path = new char[200];
     if (!path) throw std::runtime_error("Allocation of 200 bytes failed.");
-    snprintf(path, 200, "/dev/cpu/%d/msr", cpu);
+    snprintf(path, 200, "/dev/cpu/%u/msr", cpu);
     int handle = ::open(path, O_RDWR);
     if (handle < 0)
     {   // try Android msr device path
-        snprintf(path, 200, "/dev/msr%d", cpu);
+        snprintf(path, 200, "/dev/msr%u", cpu);
         handle = ::open(path, O_RDWR);
     }
     deleteAndNullifyArray(path);

src/pci.cpp

@@ -198,6 +198,7 @@ PciHandle::~PciHandle()
 #elif __APPLE__
 
 PciHandle::PciHandle(uint32 groupnr_, uint32 bus_, uint32 device_, uint32 function_) :
+    fd(-1),
     bus(bus_),
     device(device_),
     function(function_)