[Scummvm-cvs-logs] SF.net SVN: scummvm:[48937] tools/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue May 4 14:00:36 CEST 2010
Revision: 48937
http://scummvm.svn.sourceforge.net/scummvm/?rev=48937&view=rev
Author: fingolfin
Date: 2010-05-04 12:00:35 +0000 (Tue, 04 May 2010)
Log Message:
-----------
Replace calls to unlink() by new function Common::removeFile()
Modified Paths:
--------------
tools/trunk/common/file.cpp
tools/trunk/common/file.h
tools/trunk/compress.cpp
tools/trunk/engines/agos/compress_agos.cpp
tools/trunk/engines/kyra/compress_kyra.cpp
tools/trunk/engines/kyra/kyra_pak.cpp
tools/trunk/engines/queen/compress_queen.cpp
tools/trunk/engines/saga/compress_saga.cpp
tools/trunk/engines/sci/compress_sci.cpp
tools/trunk/engines/scumm/compress_scumm_bun.cpp
tools/trunk/engines/scumm/compress_scumm_san.cpp
tools/trunk/engines/scumm/compress_scumm_sou.cpp
tools/trunk/engines/sword1/compress_sword1.cpp
tools/trunk/engines/sword2/compress_sword2.cpp
tools/trunk/engines/tinsel/compress_tinsel.cpp
tools/trunk/engines/touche/compress_touche.cpp
tools/trunk/engines/tucker/compress_tucker.cpp
Modified: tools/trunk/common/file.cpp
===================================================================
--- tools/trunk/common/file.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/common/file.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -24,7 +24,11 @@
#include <stdarg.h>
#include <stdio.h>
#include <assert.h>
+#ifndef _MSC_VER
+#include <unistd.h> // for unlink()
+#endif
+
namespace Common {
// Filenname implementation
@@ -486,5 +490,9 @@
return sz;
}
+int removeFile(const char *path) {
+ return unlink(path);
+}
+
} // End of namespace Common
Modified: tools/trunk/common/file.h
===================================================================
--- tools/trunk/common/file.h 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/common/file.h 2010-05-04 12:00:35 UTC (rev 48937)
@@ -392,6 +392,15 @@
uint8 _xormode;
};
+
+/**
+ * Remove the specified file.
+ * Currently this simply call unlink() internally,
+ * but by using this wrapper we have an easier time
+ * staying compatible with Windows.
+ */
+int removeFile(const char *path);
+
} // End of namespace Common
Modified: tools/trunk/compress.cpp
===================================================================
--- tools/trunk/compress.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/compress.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -688,7 +688,7 @@
encodeAudio(TEMP_RAW, true, sampleRate, outName, compmode);
// Delete temporary file
- unlink(TEMP_RAW);
+ Common::removeFile(TEMP_RAW);
}
void CompressionTool::extractAndEncodeVOC(const char *outName, Common::File &input, AudioFormat compMode) {
Modified: tools/trunk/engines/agos/compress_agos.cpp
===================================================================
--- tools/trunk/engines/agos/compress_agos.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/agos/compress_agos.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -64,11 +64,11 @@
outputFile.close();
/* And some clean-up :-) */
- unlink(TEMP_IDX);
- unlink(TEMP_DAT);
- unlink(TEMP_RAW);
- unlink(tempEncoded);
- unlink(TEMP_WAV);
+ Common::removeFile(TEMP_IDX);
+ Common::removeFile(TEMP_DAT);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(tempEncoded);
+ Common::removeFile(TEMP_WAV);
}
Modified: tools/trunk/engines/kyra/compress_kyra.cpp
===================================================================
--- tools/trunk/engines/kyra/compress_kyra.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/kyra/compress_kyra.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -99,9 +99,9 @@
output.addFile(outputName.getFullPath().c_str(), tempEncoded);
- unlink(TEMPFILE);
- unlink(TEMP_RAW);
- unlink(tempEncoded);
+ Common::removeFile(TEMPFILE);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(tempEncoded);
}
if (output.getFileList())
@@ -285,7 +285,7 @@
encodeAudio(TEMP_RAW, true, header.freq, outfile, _format);
- unlink(TEMP_RAW);
+ Common::removeFile(TEMP_RAW);
}
struct CompressKyra::DuplicatedFile {
@@ -345,7 +345,7 @@
output.addFile(outname, outname);
- unlink(outname);
+ Common::removeFile(outname);
input.seek(pos, SEEK_SET);
}
Modified: tools/trunk/engines/kyra/kyra_pak.cpp
===================================================================
--- tools/trunk/engines/kyra/kyra_pak.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/kyra/kyra_pak.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -314,7 +314,7 @@
addFile("LINKLIST", "LINKLIST.TMP");
- unlink("LINKLIST.TMP");
+ Common::removeFile("LINKLIST.TMP");
delete[] linkList;
}
Modified: tools/trunk/engines/queen/compress_queen.cpp
===================================================================
--- tools/trunk/engines/queen/compress_queen.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/queen/compress_queen.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -168,8 +168,8 @@
fromFileToFile(inData, outFinal, dataSize);
/* Cleanup */
- unlink(TEMP_TBL);
- unlink(TEMP_DAT);
+ Common::removeFile(TEMP_TBL);
+ Common::removeFile(TEMP_DAT);
}
void CompressQueen::execute() {
@@ -275,8 +275,8 @@
compFile.close();
/* Delete temporary files */
- unlink(TEMP_SB);
- unlink(tempEncoded);
+ Common::removeFile(TEMP_SB);
+ Common::removeFile(tempEncoded);
} else {
/* Non .SB file */
bool patched = false;
Modified: tools/trunk/engines/saga/compress_saga.cpp
===================================================================
--- tools/trunk/engines/saga/compress_saga.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/saga/compress_saga.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -430,8 +430,8 @@
free(outputTable);
// Cleanup
- unlink(TEMP_RAW);
- unlink(tempEncoded);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(tempEncoded);
print("Done!\n");
}
Modified: tools/trunk/engines/sci/compress_sci.cpp
===================================================================
--- tools/trunk/engines/sci/compress_sci.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/sci/compress_sci.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -405,8 +405,8 @@
}
/* And some clean-up :-) */
- unlink(TEMP_RAW);
- unlink(TEMP_ENC);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(TEMP_ENC);
}
Modified: tools/trunk/engines/scumm/compress_scumm_bun.cpp
===================================================================
--- tools/trunk/engines/scumm/compress_scumm_bun.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/scumm/compress_scumm_bun.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -895,7 +895,7 @@
}
sprintf(tmpPath, "%s%s_reg%03d.wav", dir, filename, l);
- unlink(tmpPath);
+ Common::removeFile(tmpPath);
int32 startPos = output.pos();
switch (_format) {
@@ -923,7 +923,7 @@
byte *tmpBuf = (byte *)malloc(size);
cmpFile.read_throwsOnError(tmpBuf, size);
cmpFile.close();
- unlink(tmpPath);
+ Common::removeFile(tmpPath);
output.write(tmpBuf, size);
free(tmpBuf);
Modified: tools/trunk/engines/scumm/compress_scumm_san.cpp
===================================================================
--- tools/trunk/engines/scumm/compress_scumm_san.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/scumm/compress_scumm_san.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -304,7 +304,7 @@
byte *tmpBuf = (byte *)malloc(fileSize);
_audioTracks[l].file.read_throwsOnError(tmpBuf, fileSize);
_audioTracks[l].file.close();
- unlink(filename);
+ Common::removeFile(filename);
byte *wavBuf = (byte *)malloc(fileSize);
memset(wavBuf, 0, fileSize);
@@ -760,7 +760,7 @@
else
encodeSanWaveWithLame(tmpPath);
tmpPath += ".raw";
- unlink(tmpPath.c_str());
+ Common::removeFile(tmpPath.c_str());
}
input.close();
Modified: tools/trunk/engines/scumm/compress_scumm_sou.cpp
===================================================================
--- tools/trunk/engines/scumm/compress_scumm_sou.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/scumm/compress_scumm_sou.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -69,10 +69,10 @@
_input.close();
/* And some clean-up :-) */
- unlink(TEMP_IDX);
- unlink(TEMP_DAT);
- unlink(TEMP_RAW);
- unlink(tempEncoded);
+ Common::removeFile(TEMP_IDX);
+ Common::removeFile(TEMP_DAT);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(tempEncoded);
}
void CompressScummSou::append_byte(int size, char buf[]) {
Modified: tools/trunk/engines/sword1/compress_sword1.cpp
===================================================================
--- tools/trunk/engines/sword1/compress_sword1.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/sword1/compress_sword1.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -522,8 +522,8 @@
print("Converting CD %d...\n", i);
convertClu(clu, cl3);
}
- unlink(TEMP_RAW);
- unlink(_audioOuputFilename.c_str());
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(_audioOuputFilename.c_str());
}
void CompressSword1::compressMusic(const Common::Filename *inpath, const Common::Filename *outpath) {
@@ -535,7 +535,7 @@
try {
Common::File outf(outName, "wb");
outf.close();
- unlink(outName);
+ Common::removeFile(outName);
} catch(Common::FileException& err) {
_useOutputMusicSubdir = false;
print("Cannot create files in %s/MUSIC/; will try in %s/\n", outpath->getPath().c_str(), outpath->getPath().c_str());
Modified: tools/trunk/engines/sword2/compress_sword2.cpp
===================================================================
--- tools/trunk/engines/sword2/compress_sword2.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/sword2/compress_sword2.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -203,12 +203,12 @@
output.close();
- unlink(TEMP_DAT);
- unlink(TEMP_IDX);
- unlink(TEMP_MP3);
- unlink(TEMP_OGG);
- unlink(TEMP_FLAC);
- unlink(TEMP_WAV);
+ Common::removeFile(TEMP_DAT);
+ Common::removeFile(TEMP_IDX);
+ Common::removeFile(TEMP_MP3);
+ Common::removeFile(TEMP_OGG);
+ Common::removeFile(TEMP_FLAC);
+ Common::removeFile(TEMP_WAV);
}
#ifdef STANDALONE_MAIN
Modified: tools/trunk/engines/tinsel/compress_tinsel.cpp
===================================================================
--- tools/trunk/engines/tinsel/compress_tinsel.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/tinsel/compress_tinsel.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -73,7 +73,7 @@
print("Assuming DW1 sample being 8-bit raw...\n");
- unlink(TEMP_RAW); unlink(TEMP_ENC);
+ Common::removeFile(TEMP_RAW); Common::removeFile(TEMP_ENC);
curFileHandle.open(TEMP_RAW, "wb");
copyLeft = sampleSize;
while (copyLeft > 0) {
@@ -224,8 +224,8 @@
chunkPos = (chunkPos + 1) % 4;
}
- unlink(TEMP_RAW);
- unlink(TEMP_ENC);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(TEMP_ENC);
curFileHandle.open(TEMP_RAW, "wb");
curFileHandle.write(outBuffer, decodedCount*2);
@@ -268,10 +268,10 @@
_input_idx.open(inpath_idx, "rb");
_input_smp.open(inpath_smp, "rb");
- unlink(TEMP_IDX);
+ Common::removeFile(TEMP_IDX);
_output_idx.open(TEMP_IDX, "wb");
- unlink(TEMP_SMP);
+ Common::removeFile(TEMP_SMP);
_output_smp.open(TEMP_SMP, "wb");
_input_idx.seek(0, SEEK_END);
@@ -330,8 +330,8 @@
}
/* And some clean-up :-) */
- unlink(TEMP_RAW);
- unlink(TEMP_ENC);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(TEMP_ENC);
}
Modified: tools/trunk/engines/touche/compress_touche.cpp
===================================================================
--- tools/trunk/engines/touche/compress_touche.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/touche/compress_touche.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -22,9 +22,6 @@
#include <string.h>
#include <stdio.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#endif
#include "compress.h"
#include "compress_touche.h"
@@ -176,8 +173,8 @@
output.close();
/* cleanup */
- unlink(TEMP_RAW);
- unlink(tempEncoded);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(tempEncoded);
print("Done.\n");
}
Modified: tools/trunk/engines/tucker/compress_tucker.cpp
===================================================================
--- tools/trunk/engines/tucker/compress_tucker.cpp 2010-05-04 12:00:16 UTC (rev 48936)
+++ tools/trunk/engines/tucker/compress_tucker.cpp 2010-05-04 12:00:35 UTC (rev 48937)
@@ -412,9 +412,9 @@
output.close();
/* cleanup */
- unlink(TEMP_WAV);
- unlink(TEMP_RAW);
- unlink(tempEncoded);
+ Common::removeFile(TEMP_WAV);
+ Common::removeFile(TEMP_RAW);
+ Common::removeFile(tempEncoded);
print("Done.\n");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list