strcmp removals

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

Author: neheb

src/convert.cpp

@@ -44,10 +44,10 @@
 namespace {
 #if defined EXV_HAVE_ICONV
 // Convert string charset with iconv.
-bool convertStringCharsetIconv(std::string& str, const char* from, const char* to);
+bool convertStringCharsetIconv(std::string& str, std::string_view from, std::string_view to);
 #elif defined _WIN32
 // Convert string charset with Windows functions.
-bool convertStringCharsetWindows(std::string& str, const char* from, const char* to);
+bool convertStringCharsetWindows(std::string& str, std::string_view from, std::string_view to);
 #endif
 /*!
   @brief Get the text value of an XmpDatum \em pos.
@@ -1393,12 +1393,12 @@ namespace {
 using namespace Exiv2;
 
 #if defined EXV_HAVE_ICONV
-bool convertStringCharsetIconv(std::string& str, const char* from, const char* to) {
-  if (strcmp(from, to) == 0)
+bool convertStringCharsetIconv(std::string& str, std::string_view from, std::string_view to) {
+  if (from == to)
     return true;  // nothing to do
 
   bool ret = true;
-  auto cd = iconv_open(to, from);
+  auto cd = iconv_open(to.data(), from.data());
   if (cd == iconv_t(-1)) {
 #ifndef SUPPRESS_WARNINGS
     EXV_WARNING << "iconv_open: " << strError() << "\n";
@@ -1551,11 +1551,11 @@ bool asciiToUtf8(std::string& /*str*/) {
 using ConvFct = bool (*)(std::string&);
 
 struct ConvFctList {
-  bool operator==(const std::pair<const char*, const char*>& fromTo) const {
-    return 0 == strcmp(from_, fromTo.first) && 0 == strcmp(to_, fromTo.second);
+  bool operator==(const std::pair<std::string_view, std::string_view>& fromTo) const {
+    return from_ == fromTo.first && to_ == fromTo.second;
   }
-  const char* from_;
-  const char* to_;
+  std::string_view from_;
+  std::string_view to_;
   ConvFct convFct_;
 };
 
@@ -1567,18 +1567,19 @@ constexpr ConvFctList convFctList[] = {
     // Update the convertStringCharset() documentation if you add more here!
 };
 
-[[maybe_unused]] bool convertStringCharsetWindows(std::string& str, const char* from, const char* to) {
+bool convertStringCharsetWindows(std::string& str, std::string_view from, std::string_view to) {
   bool ret = false;
   std::string tmpstr = str;
   if (auto p = Exiv2::find(convFctList, std::pair(from, to)))
     ret = p->convFct_(tmpstr);
 #ifndef SUPPRESS_WARNINGS
   else {
-    EXV_WARNING << "No Windows function to map character string from " << from << " to " << to << " available.\n";
+    EXV_WARNING << "No Windows function to map character string from " << from.data() << " to " << to.data()
+                << " available.\n";
   }
 #endif
   if (ret)
-    str = tmpstr;
+    str = std::move(tmpstr);
   return ret;
 }
 

src/nikonmn_int.cpp

@@ -2114,7 +2114,9 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value,
 
   static constexpr struct FMntLens {
     unsigned char lid, stps, focs, focl, aps, apl, lfw, ltype, tcinfo, dblid, mid;
-    const char *manuf, *lnumber, *lensname;
+    std::string_view manuf;
+    std::string_view lnumber;
+    std::string_view lensname;
 
     bool operator==(unsigned char l) const {
       return lid == l;
@@ -3273,8 +3275,8 @@ std::ostream& Nikon3MakerNote::printLensId(std::ostream& os, const Value& value,
 
     if (raw[0] == f.lid
         // stps varies with focal length for some Sigma zoom lenses.
-        && (raw[1] == f.stps || strcmp(f.manuf, "Sigma") == 0) && raw[2] == f.focs && raw[3] == f.focl &&
-        raw[4] == f.aps && raw[5] == f.apl && raw[6] == f.lfw && raw[7] == f.ltype) {
+        && (raw[1] == f.stps || f.manuf == "Sigma") && raw[2] == f.focs && raw[3] == f.focl && raw[4] == f.aps &&
+        raw[5] == f.apl && raw[6] == f.lfw && raw[7] == f.ltype) {
       // Lens found in database
       return os << f.manuf << " " << f.lensname;
     }

src/pngimage.cpp

@@ -184,9 +184,7 @@ void PngImage::printStructure(std::ostream& out, PrintStructureOption option, si
     throw Error(ErrorCode::kerNotAnImage, "PNG");
   }
 
-  char chType[5];
-  chType[0] = 0;
-  chType[4] = 0;
+  std::string chType(4, 0);
 
   if (option == kpsBasic || option == kpsXMP || option == kpsIccProfile || option == kpsRecursive) {
     const auto xmpKey = upper("XML:com.adobe.xmp");
@@ -206,7 +204,7 @@ void PngImage::printStructure(std::ostream& out, PrintStructureOption option, si
     const size_t imgSize = io_->size();
     DataBuf cheaderBuf(8);
 
-    while (!io_->eof() && ::strcmp(chType, "IEND") != 0) {
+    while (!io_->eof() && chType != "IEND") {
       const size_t address = io_->tell();
 
       size_t bufRead = io_->read(cheaderBuf.data(), cheaderBuf.size());
@@ -260,11 +258,11 @@ void PngImage::printStructure(std::ostream& out, PrintStructureOption option, si
       }
 
       // chunk type
-      bool tEXt = std::strcmp(chType, "tEXt") == 0;
-      bool zTXt = std::strcmp(chType, "zTXt") == 0;
-      bool iCCP = std::strcmp(chType, "iCCP") == 0;
-      bool iTXt = std::strcmp(chType, "iTXt") == 0;
-      bool eXIf = std::strcmp(chType, "eXIf") == 0;
+      bool tEXt = chType == "tEXt";
+      bool zTXt = chType == "zTXt";
+      bool iCCP = chType == "iCCP";
+      bool iTXt = chType == "iTXt";
+      bool eXIf = chType == "eXIf";
 
       // for XMP, ICC etc: read and format data
       const auto dataStringU = upper(dataString);

src/tiffcomposite_int.cpp

@@ -28,8 +28,8 @@ size_t fillGap(Exiv2::Internal::IoWrapper& ioWrapper, size_t curr, size_t tobe);
 // class member definitions
 namespace Exiv2::Internal {
 bool TiffMappingInfo::operator==(const TiffMappingInfo::Key& key) const {
-  return (0 == strcmp("*", make_) || key.m_.starts_with(make_)) &&
-         (Tag::all == extendedTag_ || key.e_ == extendedTag_) && key.g_ == group_;
+  return (make_ == "*" || key.m_.starts_with(make_)) && (Tag::all == extendedTag_ || key.e_ == extendedTag_) &&
+         key.g_ == group_;
 }
 
 IoWrapper::IoWrapper(BasicIo& io, const byte* pHeader, size_t size, OffsetWriter* pow) :

src/tiffcomposite_int.hpp

@@ -356,7 +356,7 @@ struct TiffMappingInfo {
   }
 
   // DATA
-  const char* make_;       //!< Camera make for which these mapping functions apply
+  std::string_view make_;  //!< Camera make for which these mapping functions apply
   uint32_t extendedTag_;   //!< Tag (32 bit so that it can contain special tags)
   IfdId group_;            //!< Group that contains the tag
   DecoderFct decoderFct_;  //!< Decoder function for matching tags