Improvements from code review

include/exiv2/bmffimage.hpp

@@ -128,7 +128,7 @@ namespace Exiv2
         //@{
         void readMetadata() override /* override */;
         void writeMetadata() override /* override */;
-        void setComment(const std::string_view comment) override /* override */;
+        void setComment(std::string_view comment) override /* override */;
         void printStructure(std::ostream& out, Exiv2::PrintStructureOption option, int depth) override;
         //@}
 

include/exiv2/bmpimage.hpp

@@ -85,7 +85,7 @@ namespace Exiv2 {
         void setIptcData(const IptcData& iptcData) override;
 
         /// @throws Error(kerInvalidSettingForImage)
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/cr2image.hpp

@@ -81,7 +81,7 @@ namespace Exiv2 {
           @brief Not supported. CR2 format does not contain a comment.
               Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/epsimage.hpp

@@ -80,7 +80,7 @@ namespace Exiv2
           @brief Not supported.
               Calling this function will throw an instance of Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/futils.hpp

@@ -63,7 +63,7 @@ namespace Exiv2
       @note Source: http://www.geekhideout.com/urlcode.shtml
       @todo This function can probably be hidden into the implementation details
      */
-    EXIV2API std::string urlencode(const std::string_view& str);
+    EXIV2API std::string urlencode(std::string_view str);
 
     /*!
       @brief Like urlencode(char* str) but accept the input url in the std::string and modify it.

include/exiv2/gifimage.hpp

@@ -86,7 +86,7 @@ namespace Exiv2 {
           @brief Not supported. Calling this function will throw an instance
               of Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/image.hpp

@@ -197,7 +197,7 @@ namespace Exiv2 {
         virtual void clearXmpData();
 
         /// @brief Set the image comment. The comment is written to the image when writeMetadata() is called.
-        virtual void setComment(const std::string_view comment);
+        virtual void setComment(std::string_view comment);
 
         /*!
           @brief Erase any buffered comment. Comment is not removed

include/exiv2/jp2image.hpp

@@ -80,7 +80,7 @@ namespace Exiv2
           @brief Todo: Not supported yet(?). Calling this function will throw
               an instance of Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/mrwimage.hpp

@@ -89,7 +89,7 @@ namespace Exiv2 {
           @brief Not supported. MRW format does not contain a comment.
               Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/orfimage.hpp

@@ -76,7 +76,7 @@ namespace Exiv2 {
           @brief Not supported. ORF format does not contain a comment.
               Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/psdimage.hpp

@@ -70,7 +70,7 @@ namespace Exiv2 {
         /*!
           @brief Not supported. Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/rafimage.hpp

@@ -82,7 +82,7 @@ namespace Exiv2 {
           @brief Not supported. RAF format does not contain a comment.
               Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/rw2image.hpp

@@ -80,7 +80,7 @@ namespace Exiv2 {
           @brief Not supported. RW2 format does not contain a comment.
               Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/tgaimage.hpp

@@ -86,7 +86,7 @@ namespace Exiv2 {
           @brief Not supported. Calling this function will throw an instance
               of Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/tiffimage.hpp

@@ -77,7 +77,7 @@ namespace Exiv2 {
           @brief Not supported. TIFF format does not contain a comment.
               Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

include/exiv2/webpimage.hpp

@@ -65,7 +65,7 @@ namespace Exiv2 {
         /*!
           @brief Not supported. Calling this function will throw an Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         void setIptcData(const IptcData& /*iptcData*/) override;
 
         //! @name Accessors

include/exiv2/xmpsidecar.hpp

@@ -64,7 +64,7 @@ namespace Exiv2 {
           @brief Not supported. XMP sidecar files do not contain a comment.
               Calling this function will throw an instance of Error(kerInvalidSettingForImage).
          */
-        void setComment(const std::string_view comment) override;
+        void setComment(std::string_view comment) override;
         //@}
 
         //! @name Accessors

src/basicio.cpp

@@ -385,7 +385,7 @@ namespace Exiv2 {
 
             bool statOk = true;
             mode_t origStMode = 0;
-            char* pf = const_cast<char*>(path().c_str());
+            auto pf = path().c_str();
 
             Impl::StructStat buf1;
             if (p_->stat(buf1) == -1) {

src/bmffimage.cpp

@@ -627,7 +627,7 @@ namespace Exiv2
         }
     }
 
-    void BmffImage::setComment(const std::string_view /*comment*/)
+    void BmffImage::setComment(std::string_view /*comment*/)
     {
         // bmff files are read-only
         throw(Error(kerInvalidSettingForImage, "Image comment", "BMFF"));

src/bmpimage.cpp

@@ -61,7 +61,7 @@ namespace Exiv2
         throw(Error(kerInvalidSettingForImage, "IPTC metadata", "BMP"));
     }
 
-    void BmpImage::setComment(const std::string_view /*comment*/)
+    void BmpImage::setComment(std::string_view /*comment*/)
     {
         throw(Error(kerInvalidSettingForImage, "Image comment", "BMP"));
     }

src/cr2image.cpp

@@ -81,7 +81,7 @@ namespace Exiv2 {
         printTiffStructure(io(),out,option,depth-1);
     }
 
-    void Cr2Image::setComment(const std::string_view /*comment*/)
+    void Cr2Image::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "CR2"));

src/epsimage.cpp

@@ -1094,7 +1094,7 @@ namespace Exiv2
         return "application/postscript";
     }
 
-    void EpsImage::setComment(const std::string_view /*comment*/)
+    void EpsImage::setComment(std::string_view /*comment*/)
     {
         throw Error(kerInvalidSettingForImage, "Image comment", "EPS");
     }

src/futils.cpp

@@ -105,11 +105,11 @@ namespace Exiv2 {
         return isdigit(ch) ? ch - '0' : tolower(ch) - 'a' + 10;
     }
 
-    std::string urlencode(const std::string_view& str)
+    std::string urlencode(std::string_view str)
     {
         std::string encoded;
         encoded.reserve(str.size() * 3);
-        for (auto c : str) {
+        for (uint8_t c : str) {
             if (isalnum(c) || c == '-' || c == '_' || c == '.' || c == '~')
                 encoded += c;
             else if (c == ' ')

src/gifimage.cpp

@@ -58,7 +58,7 @@ namespace Exiv2 {
         throw(Error(kerInvalidSettingForImage, "IPTC metadata", "GIF"));
     }
 
-    void GifImage::setComment(const std::string_view /*comment*/)
+    void GifImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "GIF"));

src/image.cpp

@@ -662,7 +662,7 @@ namespace Exiv2 {
         comment_.erase();
     }
 
-    void Image::setComment(const std::string_view comment)
+    void Image::setComment(std::string_view comment)
     {
         comment_ = comment;
     }

src/jp2image.cpp

@@ -158,7 +158,7 @@ namespace Exiv2
         return "image/jp2";
     }
 
-    void Jp2Image::setComment(const std::string_view /*comment*/)
+    void Jp2Image::setComment(std::string_view /*comment*/)
     {
         // Todo: implement me!
         throw(Error(kerInvalidSettingForImage, "Image comment", "JP2"));

src/makernote_int.cpp

@@ -35,6 +35,7 @@
 #include "utils.hpp"
 
 // + standard includes
+#include <array>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -1197,7 +1198,7 @@ namespace Exiv2 {
     {
         // Not valid for models beginning
         std::string model = getExifModel(pRoot);
-        const std::vector<std::string> strs { "SLT-", "HV", "ILCA-"};
+        const std::array strs { "SLT-", "HV", "ILCA-"};
         return std::any_of(strs.begin(), strs.end(), [&model](auto& m){return startsWith(model, m);}) ? -1 : 0;
     }
 

src/mrwimage.cpp

@@ -79,7 +79,7 @@ namespace Exiv2 {
         throw(Error(kerInvalidSettingForImage, "IPTC metadata", "MRW"));
     }
 
-    void MrwImage::setComment(const std::string_view /*comment*/)
+    void MrwImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "MRW"));

src/orfimage.cpp

@@ -72,7 +72,7 @@ namespace Exiv2 {
         return 0;
     }
 
-    void OrfImage::setComment(const std::string_view /*comment*/)
+    void OrfImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "ORF"));

src/psdimage.cpp

@@ -127,7 +127,7 @@ namespace Exiv2 {
         return "image/x-photoshop";
     }
 
-    void PsdImage::setComment(const std::string_view /*comment*/)
+    void PsdImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "Photoshop"));

src/rafimage.cpp

@@ -81,7 +81,7 @@ namespace Exiv2 {
         throw(Error(kerInvalidSettingForImage, "IPTC metadata", "RAF"));
     }
 
-    void RafImage::setComment(const std::string_view /*comment*/)
+    void RafImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "RAF"));

src/rw2image.cpp

@@ -83,7 +83,7 @@ namespace Exiv2 {
         throw(Error(kerInvalidSettingForImage, "IPTC metadata", "RW2"));
     }
 
-    void Rw2Image::setComment(const std::string_view /*comment*/)
+    void Rw2Image::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "RW2"));

src/tgaimage.cpp

@@ -58,7 +58,7 @@ namespace Exiv2 {
         throw(Error(kerInvalidSettingForImage, "IPTC metadata", "TGA"));
     }
 
-    void TgaImage::setComment(const std::string_view /*comment*/)
+    void TgaImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "TGA"));

src/tiffimage.cpp

@@ -162,7 +162,7 @@ namespace Exiv2 {
         return pixelHeightPrimary_;
     }
 
-    void TiffImage::setComment(const std::string_view /*comment*/)
+    void TiffImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "TIFF"));

src/webpimage.cpp

@@ -96,7 +96,7 @@ namespace Exiv2 {
         // throw(Error(kerInvalidSettingForImage, "IPTC metadata", "WebP"));
     }
 
-    void WebPImage::setComment(const std::string_view /*comment*/)
+    void WebPImage::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "WebP"));

src/xmpsidecar.cpp

@@ -62,7 +62,7 @@ namespace Exiv2 {
         return "application/rdf+xml";
     }
 
-    void XmpSidecar::setComment(const std::string_view /*comment*/)
+    void XmpSidecar::setComment(std::string_view /*comment*/)
     {
         // not supported
         throw(Error(kerInvalidSettingForImage, "Image comment", "XMP"));