replace cout with printf

neotools/autoextract.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+set -e
 
 FILE="$1"
 NAME="$(basename "$FILE")"
@@ -6,7 +7,7 @@ WAVDIR="${NAME%%.*}"
 
 if [ "${NAME##*.}" = "vgz" ]; then
 	cp "$FILE" "temp.vgm.gz"
-	gzip -d "temp.vgm.gz"
+	gzip -fd "temp.vgm.gz"
 	FILE="temp.vgm"
 fi
 

neotools/neoadpcmextract.cpp

@@ -18,75 +18,70 @@
   3. This notice may not be removed or altered from any source distribution.
 */
 
-#include <iostream>
-#include <fstream>
 #include <string>
 #include <sstream>
 #include <vector>
 #include <cstdint>
 
-void DecodeSample(FILE* file, std::vector <uint8_t>& a_out)
+void DecodeSample(FILE* fin, const std::string& name, std::vector <uint8_t>& buf)
 {
 	// Set up output vector.
 	uint32_t sampLen = 0;
-	fread(&sampLen, sizeof(uint32_t), 1, file);
+	fread(&sampLen, sizeof(uint32_t), 1, fin);
 	if (sampLen < sizeof(uint64_t))
 		return;
 
 	sampLen -= sizeof(uint64_t);
-	a_out.clear();
+	buf.clear();
-	a_out.resize(sampLen);
+	buf.resize(sampLen);
 
 	// Ignore 8 bytes.
 	uint64_t dummy;
-	fread(&dummy, sizeof(uint64_t), 1, file);
+	fread(&dummy, sizeof(uint64_t), 1, fin);
 
 	// Read adpcm data.
-	fread(a_out.data(), sizeof(uint8_t), sampLen, file);
+	fread(buf.data(), sizeof(uint8_t), sampLen, fin);
-}
 
-void DumpBytes(std::string a_path, const std::vector<uint8_t>& a_bytes)
+	FILE* fout = fopen(name.c_str(), "wb");
-{
+	if (!fout)
-	std::ofstream fileOut(a_path, std::ios::binary);
+		return;
-	fileOut.write((const char*)a_bytes.data(), a_bytes.size());
+
-	fileOut.close();
+	fwrite(buf.data(), sizeof(uint8_t), buf.size(), fout);
+	fclose(fout);
 }
 
 int main(int argc, char** argv)
 {
 	if (argc != 2)
-		return -1;
+		return 1;
 
 	// Open file.
 	FILE* file = fopen(argv[1], "rb");
 	if (!file)
-		return -1;
+		return 1;
 
 	// Search for pcm headers.
 	std::vector<uint8_t> smpBytes;
 	int smpaCount = 0, smpbCount = 0;
 	while (!feof(file) && !ferror(file))
 	{
-		if (fgetc(file) != 0x67 &&
+		if (fgetc(file) != 0x67 || fgetc(file) != 0x66)
-			fgetc(file) != 0x66)
 			continue;
 
 		uint8_t byte = fgetc(file);
 		if (byte == 0x82)
 		{
-			std::cout << "ADPCM-A data found at 0x" << std::hex << ftell(file) << std::endl;
+			printf("ADPCM-A data found at 0x%08lX\n", ftell(file));
-			DecodeSample(file, smpBytes);
 			std::stringstream path;
 			path << std::hex << "smpa_" << (smpaCount++) << ".pcm";
-			DumpBytes(path.str(), smpBytes);
+			DecodeSample(file, path.str(), smpBytes);
 		}
 		else if (byte == 0x83)
 		{
-			std::cout << "ADPCM-B data found at 0x" << std::hex << ftell(file) << std::endl;
+			printf("ADPCM-B data found at 0x%08lX\n", ftell(file));
-			DecodeSample(file, smpBytes);
 			std::stringstream path;
 			path << std::hex << "smpb_" << (smpbCount++) << ".pcm";
-			DumpBytes(path.str(), smpBytes);
+			DecodeSample(file, path.str(), smpBytes);
 		}
 	}