clang 9 compilation fixes

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

Author: neheb

src/http.cpp

@@ -112,16 +112,6 @@ static Exiv2::Dictionary stringToDict(const std::string& s) {
   return result;
 }
 
-static int makeNonBlocking(auto sockfd) {
-#if defined(_WIN32)
-  ULONG ioctl_opt = 1;
-  return ioctlsocket(sockfd, FIONBIO, &ioctl_opt);
-#else
-  int result = fcntl(sockfd, F_SETFL, O_NONBLOCK);
-  return result >= 0 ? result : SOCKET_ERROR;
-#endif
-}
-
 int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::string& errors) {
   request.try_emplace("verb", "GET");
   request.try_emplace("header");
@@ -212,7 +202,15 @@ int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::st
     freeaddrinfo(r);
   }
 
-  makeNonBlocking(sockfd);
+  [](auto sockfd) {
+#if defined(_WIN32)
+    ULONG ioctl_opt = 1;
+    return ioctlsocket(sockfd, FIONBIO, &ioctl_opt);
+#else
+    int result = fcntl(sockfd, F_SETFL, O_NONBLOCK);
+    return result >= 0 ? result : SOCKET_ERROR;
+#endif
+  }(sockfd);
 
   ////////////////////////////////////
   // and connect

src/tiffcomposite_int.cpp

@@ -7,6 +7,7 @@
 #include "basicio.hpp"
 #include "enforce.hpp"
 #include "error.hpp"
+#include "image_int.hpp"
 #include "makernote_int.hpp"
 #include "safe_op.hpp"
 #include "sonymn_int.hpp"
@@ -737,9 +738,9 @@ size_t TiffMnEntry::doCount() const {
   // Count of IFD makernote in tag Exif.Photo.MakerNote is the size of the
   // Makernote in bytes
   if (tiffType() != ttUndefined && tiffType() != ttUnsignedByte && tiffType() != ttSignedByte) {
-    EXV_ERROR << "Makernote entry 0x" << std::setw(4) << std::setfill('0') << std::hex << tag()
-              << " has incorrect Exif (TIFF) type " << std::dec << tiffType()
-              << ". (Expected signed or unsigned byte.)\n";
+    EXV_ERROR << stringFormat(
+        "Makernote entry 0x{:04x} has incorrect Exif (TIFF) type {}. (Expected signed or unsigned byte.)\n", tag(),
+        static_cast<uint16_t>(tiffType()));
   }
 #endif
   return mn_->size();
@@ -760,8 +761,8 @@ size_t TiffBinaryArray::doCount() const {
   size_t typeSize = TypeInfo::typeSize(typeId);
   if (0 == typeSize) {
 #ifndef SUPPRESS_WARNINGS
-    EXV_WARNING << "Directory " << groupName(group()) << ", entry 0x" << std::setw(4) << std::setfill('0') << std::hex
-                << tag() << " has unknown Exif (TIFF) type " << std::dec << tiffType() << "; setting type size 1.\n";
+    EXV_WARNING << stringFormat("Directory {}, entry 0x{:04x} has unknown Exif (TIFF) type {}; setting type size 1.\n",
+                                groupName(group()), tag(), static_cast<uint16_t>(tiffType()));
 #endif
     typeSize = 1;
   }

src/tiffimage_int.cpp

@@ -2195,7 +2195,7 @@ DataBuf TiffHeaderBase::write() const {
   return buf;
 }
 
-void TiffHeaderBase::print(std::ostream& os, std::string_view prefix) const {
+void TiffHeaderBase::print(std::ostream& os, const char* prefix) const {
   os << stringFormat("{}{} = 0x{:08x}", prefix, _("TIFF header, offset"), offset_);
 
   switch (byteOrder_) {

src/tiffimage_int.hpp

@@ -75,7 +75,7 @@ class TiffHeaderBase {
     @param os Output stream to write to.
     @param prefix Prefix to be written before each line of output.
    */
-  virtual void print(std::ostream& os, std::string_view prefix = "") const;
+  virtual void print(std::ostream& os, const char* prefix = "") const;
   //! Return the byte order (little or big endian).
   [[nodiscard]] virtual ByteOrder byteOrder() const;
   //! Return the offset to the start of the root directory.

src/tiffvisitor_int.cpp

@@ -1241,19 +1241,18 @@ void TiffReader::readTiffEntry(TiffEntryBase* object) {
     size_t typeSize = TypeInfo::typeSize(typeId);
     if (0 == typeSize) {
 #ifndef SUPPRESS_WARNINGS
-      EXV_WARNING << "Directory " << groupName(object->group()) << ", entry 0x" << std::setw(4) << std::setfill('0')
-                  << std::hex << object->tag() << " has unknown Exif (TIFF) type " << std::dec << tiffType
-                  << "; setting type size 1.\n";
+      EXV_WARNING << stringFormat(
+          "Directory {}, entry 0x{:04x} has unknown Exif (TIFF) type {}; setting type size 1.\n",
+          groupName(object->group()), object->tag(), static_cast<uint16_t>(tiffType));
 #endif
       typeSize = 1;
     }
     p += 2;
     uint32_t count = getULong(p, byteOrder());
     if (count >= 0x10000000) {
 #ifndef SUPPRESS_WARNINGS
-      EXV_ERROR << "Directory " << groupName(object->group()) << ", entry 0x" << std::setw(4) << std::setfill('0')
-                << std::hex << object->tag() << " has invalid size " << std::dec << count << "*" << typeSize
-                << "; skipping entry.\n";
+      EXV_ERROR << stringFormat("Directory {}, entry 0x{:04x} has invalid size {}*{}; skipping entry.\n",
+                                groupName(object->group()), object->tag(), count, typeSize);
 #endif
       return;
     }