more SonarLint cleanups

Signed-off-by: Rosen Penev <[email protected]>

Author: neheb

app/exiv2.cpp

@@ -1092,7 +1092,9 @@ int Params::getopt(int argc, char* const Argv[]) {
 // local implementations
 namespace {
 bool parseTime(const std::string& ts, int64_t& time) {
-  std::string hstr, mstr, sstr;
+  std::string hstr;
+  std::string mstr;
+  std::string sstr;
   auto cts = new char[ts.length() + 1];
   strcpy(cts, ts.c_str());
   auto tmp = ::strtok(cts, ":");
@@ -1107,7 +1109,9 @@ bool parseTime(const std::string& ts, int64_t& time) {
   delete[] cts;
 
   int sign = 1;
-  int64_t hh(0), mm(0), ss(0);
+  int64_t hh = 0;
+  int64_t mm = 0;
+  int64_t ss = 0;
   // [-]HH part
   if (!Util::strtol(hstr.c_str(), hh))
     return false;

include/exiv2/iptc.hpp

@@ -177,7 +177,7 @@ class EXIV2API IptcData {
     @return 0 if successful;<BR>
             6 if the dataset already exists and is not repeatable
    */
-  int add(const IptcKey& key, Value* value);
+  int add(const IptcKey& key, const Value* value);
   /*!
     @brief Add a copy of the Iptcdatum to the IPTC metadata. A check
            for non-repeatable datasets is performed.
@@ -244,7 +244,7 @@ class EXIV2API IptcData {
   [[nodiscard]] const_iterator findId(uint16_t dataset, uint16_t record = IptcDataSets::application2) const;
   //! Return true if there is no IPTC metadata
   [[nodiscard]] bool empty() const {
-    return count() == 0;
+    return iptcMetadata_.empty();
   }
 
   //! Get the number of metadata entries

include/exiv2/quicktimevideo.hpp

@@ -200,7 +200,8 @@ class EXIV2API QuickTimeVideo : public Image {
   //! Variable to check the end of metadata traversing.
   bool continueTraversing_ = false;
   //! Variable to store height and width of a video frame.
-  uint64_t height_ = 0, width_ = 0;
+  uint64_t height_ = 0;
+  uint64_t width_ = 0;
 
 };  // QuickTimeVideo End
 

include/exiv2/riffvideo.hpp

@@ -48,7 +48,7 @@ class EXIV2API RiffVideo : public Image {
     uint64_t size_ = 0;
 
    public:
-    explicit HeaderReader(BasicIo::UniquePtr& io);
+    explicit HeaderReader(const BasicIo::UniquePtr& io);
 
     [[nodiscard]] uint64_t getSize() const {
       return size_;
@@ -59,9 +59,9 @@ class EXIV2API RiffVideo : public Image {
     }
   };
 
-  void readList(HeaderReader& header_);
+  void readList(const HeaderReader& header_);
 
-  void readChunk(HeaderReader& header_);
+  void readChunk(const HeaderReader& header_);
 
   void decodeBlocks();
 

include/exiv2/slice.hpp

@@ -48,7 +48,8 @@ struct SliceBase {
    * lower and upper bounds of the slice with respect to the
    * container/array stored in storage_
    */
-  const size_t begin_, end_;
+  size_t begin_;
+  size_t end_;
 };
 
 /*!
@@ -260,10 +261,13 @@ struct MutableSliceBase : public ConstSliceBase<storage_type, data_type> {
 template <typename container>
 struct ContainerStorage {
   using iterator = typename container::iterator;
-
   using const_iterator = typename container::const_iterator;
 
+#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
+  using value_type = std::remove_cv_t<typename container::value_type>;
+#else
   using value_type = typename std::remove_cv<typename container::value_type>::type;
+#endif
 
   /*!
    * @throw std::out_of_range when end is larger than the container's
@@ -324,7 +328,11 @@ struct ContainerStorage {
  */
 template <typename storage_type>
 struct PtrSliceStorage {
+#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
+  using value_type = std::remove_cv_t<std::remove_pointer_t<storage_type>>;
+#else
   using value_type = typename std::remove_cv<typename std::remove_pointer<storage_type>::type>::type;
+#endif
   using iterator = value_type*;
   using const_iterator = const value_type*;
 
@@ -423,7 +431,11 @@ struct Slice : public Internal::MutableSliceBase<Internal::ContainerStorage, con
 
   using const_iterator = typename container::const_iterator;
 
+#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
+  using value_type = std::remove_cv_t<typename container::value_type>;
+#else
   using value_type = typename std::remove_cv<typename container::value_type>::type;
+#endif
 
   /*!
    * @brief Construct a slice of the container `cont` starting at `begin`
@@ -476,7 +488,11 @@ struct Slice<const container> : public Internal::ConstSliceBase<Internal::Contai
 
   using const_iterator = typename container::const_iterator;
 
+#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L
+  using value_type = std::remove_cv_t<typename container::value_type>;
+#else
   using value_type = typename std::remove_cv<typename container::value_type>::type;
+#endif
 
   Slice(const container& cont, size_t begin, size_t end) :
       Internal::ConstSliceBase<Internal::ContainerStorage, const container>(cont, begin, end) {

include/exiv2/value.hpp

@@ -1502,9 +1502,8 @@ template <typename T>
 int ValueType<T>::read(const byte* buf, size_t len, ByteOrder byteOrder) {
   value_.clear();
   size_t ts = TypeInfo::typeSize(typeId());
-  if (ts > 0)
-    if (len % ts != 0)
-      len = (len / ts) * ts;
+  if (ts > 0 && len % ts != 0)
+    len = (len / ts) * ts;
   for (size_t i = 0; i < len; i += ts) {
     value_.push_back(getValue<T>(buf + i, byteOrder));
   }

src/asfvideo.cpp

@@ -362,22 +362,22 @@ void AsfVideo::DegradableJPEGMedia() {
 void AsfVideo::streamProperties() {
   DataBuf streamTypedBuf = io_->read(GUID);
 
-  enum streamTypeInfo { Audio = 1, Video = 2 };
-  int stream = 0;
+  enum class streamTypeInfo { Audio = 1, Video = 2 };
+  auto stream = static_cast<streamTypeInfo>(0);
 
   auto tag_stream_type = GUIDReferenceTags.find(GUIDTag(streamTypedBuf.data()));
   if (tag_stream_type != GUIDReferenceTags.end()) {
     if (tag_stream_type->second == "Audio_Media")
-      stream = Audio;
+      stream = streamTypeInfo::Audio;
     else if (tag_stream_type->second == "Video_Media")
-      stream = Video;
+      stream = streamTypeInfo::Video;
 
     io_->seek(io_->tell() + GUID, BasicIo::beg);  // ignore Error Correction Type
 
     uint64_t time_offset = readQWORDTag(io_);
-    if (stream == Video)
+    if (stream == streamTypeInfo::Video)
       xmpData()["Xmp.video.TimeOffset"] = time_offset;
-    else if (stream == Audio)
+    else if (stream == streamTypeInfo::Audio)
       xmpData()["Xmp.audio.TimeOffset"] = time_offset;
 
     auto specific_data_length = readDWORDTag(io_);
@@ -396,12 +396,10 @@ void AsfVideo::codecList() {
     uint16_t codec_type = readWORDTag(io_) * 2;
     std::string codec = (codec_type == 1) ? "Xmp.video" : "Xmp.audio";
 
-    uint16_t codec_name_length = readWORDTag(io_) * 2;
-    if (codec_name_length)
+    if (uint16_t codec_name_length = readWORDTag(io_) * 2)
       xmpData()[codec + std::string(".CodecName")] = readStringWcharTag(io_, codec_name_length);
 
-    uint16_t codec_desc_length = readWORDTag(io_);
-    if (codec_desc_length)
+    if (uint16_t codec_desc_length = readWORDTag(io_))
       xmpData()[codec + std::string(".CodecDescription")] = readStringWcharTag(io_, codec_desc_length);
 
     uint16_t codec_info_length = readWORDTag(io_);
@@ -422,13 +420,11 @@ void AsfVideo::extendedContentDescription() {
   std::string value;
 
   for (uint16_t i = 0; i < content_descriptor_count; i++) {
-    uint16_t descriptor_name_length = readWORDTag(io_);
-    if (descriptor_name_length)
+    if (uint16_t descriptor_name_length = readWORDTag(io_))
       value += readStringWcharTag(io_, descriptor_name_length);  // Descriptor Name
 
     uint16_t descriptor_value_data_type = readWORDTag(io_);
-    uint16_t descriptor_value_length = readWORDTag(io_);
-    if (descriptor_value_length) {
+    if (uint16_t descriptor_value_length = readWORDTag(io_)) {
       // Descriptor Value
       switch (descriptor_value_data_type) {
         case 0 /*Unicode string */:
@@ -448,7 +444,6 @@ void AsfVideo::extendedContentDescription() {
           break;
         case 5 /*WORD*/:
           value += std::string(": ") + std::to_string(readWORDTag(io_));
-          ;
           break;
       }
     }

src/basicio.cpp

@@ -159,7 +159,11 @@ int FileIo::Impl::switchMode(OpMode opMode) {
   }
 
   // Reopen the file
-  long offset = std::ftell(fp_);
+#ifdef _WIN32
+  auto offset = _ftelli64(fp_);
+#else
+  auto offset = ftello(fp_);
+#endif
   if (offset == -1)
     return -1;
   // 'Manual' open("r+b") to avoid munmap()
@@ -172,7 +176,11 @@ int FileIo::Impl::switchMode(OpMode opMode) {
   fp_ = std::fopen(path_.c_str(), openMode_.c_str());
   if (!fp_)
     return 1;
-  return std::fseek(fp_, offset, SEEK_SET);
+#ifdef _WIN32
+  return _fseeki64(fp_, offset, SEEK_SET);
+#else
+  return fseeko(fp_, offset, SEEK_SET);
+#endif
 }  // FileIo::Impl::switchMode
 
 int FileIo::Impl::stat(StructStat& buf) const {
@@ -460,15 +468,19 @@ int FileIo::seek(int64_t offset, Position pos) {
 
   if (p_->switchMode(Impl::opSeek) != 0)
     return 1;
-#ifdef _WIN64
+#ifdef _WIN32
   return _fseeki64(p_->fp_, offset, fileSeek);
 #else
-  return std::fseek(p_->fp_, static_cast<long>(offset), fileSeek);
+  return fseeko(p_->fp_, offset, fileSeek);
 #endif
 }
 
 size_t FileIo::tell() const {
-  const long pos = std::ftell(p_->fp_);
+#ifdef _WIN32
+  auto pos = _ftelli64(p_->fp_);
+#else
+  auto pos = ftello(p_->fp_);
+#endif
   Internal::enforce(pos >= 0, ErrorCode::kerInputDataReadFailed);
   return static_cast<size_t>(pos);
 }
@@ -1069,7 +1081,8 @@ size_t RemoteIo::Impl::populateBlocks(size_t lowBlock, size_t highBlock) {
       throw Error(ErrorCode::kerErrorMessage, "Data By Range is empty. Please check the permission.");
     }
     auto source = reinterpret_cast<byte*>(const_cast<char*>(data.c_str()));
-    size_t remain = rcount, totalRead = 0;
+    size_t remain = rcount;
+    size_t totalRead = 0;
     size_t iBlock = (rcount == size_) ? 0 : lowBlock;
 
     while (remain) {
@@ -1109,7 +1122,9 @@ int RemoteIo::open() {
       p_->blocksMap_ = new BlockMap[nBlocks];
       p_->isMalloced_ = true;
       auto source = reinterpret_cast<byte*>(const_cast<char*>(data.c_str()));
-      size_t remain = p_->size_, iBlock = 0, totalRead = 0;
+      size_t remain = p_->size_;
+      size_t iBlock = 0;
+      size_t totalRead = 0;
       while (remain) {
         auto allow = std::min<size_t>(remain, p_->blockSize_);
         p_->blocksMap_[iBlock].populate(&source[totalRead], allow);
@@ -1465,8 +1480,7 @@ void HttpIo::HttpImpl::writeRemote(const byte* data, size_t size, size_t from, s
   }
 
   // standardize the path without "/" at the beginning.
-  std::size_t protocolIndex = scriptPath.find("://");
-  if (protocolIndex == std::string::npos && scriptPath.front() != '/') {
+  if (scriptPath.find("://") == std::string::npos && scriptPath.front() != '/') {
     scriptPath = "/" + scriptPath;
   }
 
@@ -1651,8 +1665,7 @@ void CurlIo::CurlImpl::writeRemote(const byte* data, size_t size, size_t from, s
   Exiv2::Uri hostInfo = Exiv2::Uri::Parse(path_);
 
   // add the protocol and host to the path
-  std::size_t protocolIndex = scriptPath.find("://");
-  if (protocolIndex == std::string::npos) {
+  if (scriptPath.find("://") == std::string::npos) {
     if (scriptPath.front() != '/')
       scriptPath = "/" + scriptPath;
     scriptPath = hostInfo.Protocol + "://" + hostInfo.Host + scriptPath;

src/bmffimage.cpp

@@ -137,18 +137,16 @@ std::string BmffImage::mimeType() const {
 
 uint32_t BmffImage::pixelWidth() const {
   auto imageWidth = exifData_.findKey(Exiv2::ExifKey("Exif.Photo.PixelXDimension"));
-  if (imageWidth != exifData_.end() && imageWidth->count() > 0) {
-    return imageWidth->toUint32();
-  }
-  return pixelWidth_;
+  if (imageWidth == exifData_.end() || imageWidth->count() == 0)
+    return pixelWidth_;
+  return imageWidth->toUint32();
 }
 
 uint32_t BmffImage::pixelHeight() const {
   auto imageHeight = exifData_.findKey(Exiv2::ExifKey("Exif.Photo.PixelYDimension"));
-  if (imageHeight != exifData_.end() && imageHeight->count() > 0) {
-    return imageHeight->toUint32();
-  }
-  return pixelHeight_;
+  if (imageHeight == exifData_.end() || imageHeight->count() == 0)
+    return pixelHeight_;
+  return imageHeight->toUint32();
 }
 
 std::string BmffImage::uuidName(const Exiv2::DataBuf& uuid) {
@@ -254,13 +252,13 @@ uint64_t BmffImage::boxHandler(std::ostream& out /* = std::cout*/, Exiv2::PrintS
 
   size_t hdrsize = sizeof(hdrbuf);
   Internal::enforce(hdrsize <= static_cast<size_t>(pbox_end - address), Exiv2::ErrorCode::kerCorruptedMetadata);
-  if (io_->read(reinterpret_cast<byte*>(&hdrbuf), sizeof(hdrbuf)) != sizeof(hdrbuf))
+  if (io_->read(hdrbuf, sizeof(hdrbuf)) != sizeof(hdrbuf))
     return pbox_end;
 
   // The box length is encoded as a uint32_t by default, but the special value 1 means
   // that it's a uint64_t.
-  uint64_t box_length = getULong(reinterpret_cast<byte*>(&hdrbuf[0]), endian_);
-  uint32_t box_type = getULong(reinterpret_cast<byte*>(&hdrbuf[sizeof(uint32_t)]), endian_);
+  uint64_t box_length = getULong(&hdrbuf[0], endian_);
+  uint32_t box_type = getULong(&hdrbuf[sizeof(uint32_t)], endian_);
   bool bLF = true;
 
   if (bTrace) {