refactor: delegate setvbuf buffer allocation to C stdio

Author: N4gtan

libxa_deinterleaver.hxx

@@ -38,8 +38,7 @@ public:
             fprintf(stderr, "Error: Cannot read \"%s\". %s\n", inputPath.filename().string().c_str(), strerror(errno));
             return;
         }
-        std::unique_ptr<char[]> stdiBuf(new char[STDIO_IOFBF_SIZE]);
-        setvbuf(inputFile.get(), stdiBuf.get(), _IOFBF, STDIO_IOFBF_SIZE);
+        setvbuf(inputFile.get(), nullptr, _IOFBF, STDIO_IOFBF_SIZE);
 
         if (fread(buffer + FILENUM_OFFSET, 1, XA_DATA_SIZE, inputFile.get()) != XA_DATA_SIZE)
         {
@@ -111,12 +110,10 @@ public:
         if (!std::filesystem::exists(outputDir))
             std::filesystem::create_directories(outputDir);
 
-        std::unique_ptr<char[]> stdiBuf(new char[STDIO_IOFBF_SIZE]);
-        std::unique_ptr<char[]> stdoBuf(new char[STDIO_IOFBF_SIZE]);
-
         std::unique_ptr<FILE, decltype(&fclose)> inputFile(fopen(inputPath.string().c_str(), "rb"), &fclose);
-        setvbuf(inputFile.get(), stdiBuf.get(), _IOFBF, STDIO_IOFBF_SIZE);
+        setvbuf(inputFile.get(), nullptr, _IOFBF, STDIO_IOFBF_SIZE);
 
+        std::unique_ptr<char[]> stdoBuf(new char[STDIO_IOFBF_SIZE]);
         for (const FileInfo &entry : entries)
         {
             std::filesystem::path fileName = std::filesystem::u8path(entry.fileName);
@@ -205,7 +202,8 @@ private:
         int chunksRead = 0;
         bool eof = buffer[SUBMODE_OFFSET] & 0x80; // 0x80 = EOF_MASK
         bool silent = isSilent();
-        do {
+        for (;;)
+        {
             //entry.endSec = currentSector;
             processedSectors[currentSector++] = true;
             //if (currentSector >= 42185)                                                                              //
@@ -274,7 +272,7 @@ private:
                 if (silent)
                     silent = isSilent();
             }
-        } while (true);
+        }
 
     END:
         const int nullSectors = entry.nullTrailing / entry.sectorChunk * entry.sectorStride + entry.nullTrailing;

xa-interleaver.cxx

@@ -34,8 +34,7 @@ int main(int argc, char *argv[])
         fprintf(stderr, "Error: Cannot write \"%s\". %s\n", outputPath.string().c_str(), strerror(errno));
         return EXIT_FAILURE;
     }
-    std::unique_ptr<char[]> stdoBuf(new char[1024 * 1024]);
-    setvbuf(outputFile, stdoBuf.get(), _IOFBF, 1024 * 1024);
+    setvbuf(outputFile, nullptr, _IOFBF, 1024 * 1024);
 
     files.interleave(outputFile, sectorSize);
     fclose(outputFile);