Merge pull request Exiv2#3203 from neheb/3

vector to make_unique

Author: neheb

samples/geotag.cpp

@@ -452,10 +452,9 @@ bool readDir(const char* path, Options& options) {
   DIR* dir = opendir(path);
   if (dir != nullptr) {
     bResult = true;
-    struct dirent* ent;
 
     // print all the files and directories within directory
-    while ((ent = readdir(dir)) != nullptr) {
+    while (auto ent = readdir(dir)) {
       std::string pathName = makePath(path, ent->d_name);
       if (ent->d_name[0] != '.') {
         // printf("reading %s => %s\n",ent->d_name,pathName.c_str());

samples/iotest.cpp

@@ -37,30 +37,23 @@ int main(int argc, char* const argv[]) {
     const char* ba = argv[5];  // block argument
 
     if (argc >= 5) {
-      int blocksize = argc == 6 ? atoi(ba) : 10000;
-      // ensure blocksize is sane
-      if (blocksize > 1024 * 1024)
-        blocksize = 10000;
-
-      std::vector<Exiv2::byte> bytes(blocksize);
-
       // copy fileIn from a remote location.
       auto io = Exiv2::ImageFactory::createIo(fr);
       if (io->open() != 0) {
-        Error(Exiv2::ErrorCode::kerFileOpenFailed, io->path(), "rb", strError());
+        throw Error(Exiv2::ErrorCode::kerFileOpenFailed, io->path(), "rb", strError());
       }
       FileIo output(f0);
       if (!output.open("wb")) {
         Error(Exiv2::ErrorCode::kerFileOpenFailed, output.path(), "w+b", strError());
       }
-      size_t l = 0;
-      if (!bytes.empty()) {
-        size_t r;
-        while ((r = io->read(bytes.data(), blocksize)) > 0) {
-          l += r;
-          output.write(bytes.data(), r);
+      int blocksize = std::min(argc == 6 ? atoi(ba) : 10000, 1024 * 1024);
+      if (blocksize > 0) {
+        auto bytes = std::make_unique<Exiv2::byte[]>(blocksize);
+        while (auto r = io->read(bytes.get(), blocksize)) {
+          output.write(bytes.get(), r);
         }
       } else {
+        size_t l = 0;
         // read/write byte-wise (#1029)
         while (l++ < io->size()) {
           output.putb(io->getb());
@@ -118,9 +111,8 @@ int main(int argc, char* const argv[]) {
       throw Error(Exiv2::ErrorCode::kerFileOpenFailed, f2, "w+b", strError());
     }
 
-    size_t readCount = 0;
     byte buf[32];
-    while ((readCount = fileOut1.read(buf, sizeof(buf)))) {
+    while (auto readCount = fileOut1.read(buf, sizeof(buf))) {
       if (memIo2.write(buf, readCount) != readCount) {
         std::cerr << argv[0] << ": MemIo bad write 2\n";
         return 13;

src/image.cpp

@@ -451,10 +451,10 @@ void Image::printIFDStructure(BasicIo& io, std::ostream& out, Exiv2::PrintStruct
 
             const size_t restore = io.tell();
             io.seekOrThrow(offset, BasicIo::beg, ErrorCode::kerCorruptedMetadata);  // position
-            std::vector<byte> bytes(count);                                         // allocate memory
-            io.readOrThrow(bytes.data(), count, ErrorCode::kerCorruptedMetadata);
+            auto bytes = std::make_unique<byte[]>(count);                           // allocate memory
+            io.readOrThrow(bytes.get(), count, ErrorCode::kerCorruptedMetadata);
             io.seekOrThrow(restore, BasicIo::beg, ErrorCode::kerCorruptedMetadata);
-            IptcData::printStructure(out, makeSliceUntil(bytes.data(), count), depth);
+            IptcData::printStructure(out, makeSliceUntil(bytes.get(), count), depth);
           }
         } else if (option == kpsRecursive && tag == 0x927c /* MakerNote */ && count > 10) {
           const size_t restore = io.tell();  // save

src/xmpsidecar.cpp

@@ -56,8 +56,7 @@ void XmpSidecar::readMetadata() {
   std::string xmpPacket;
   const long len = 64 * 1024;
   byte buf[len];
-  size_t l;
-  while ((l = io_->read(buf, len)) > 0) {
+  while (auto l = io_->read(buf, len)) {
     xmpPacket.append(reinterpret_cast<char*>(buf), l);
   }
   if (io_->error())