[Scummvm-cvs-logs] SF.net SVN: scummvm:[41561] tools/branches/gsoc2009-gui
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Jun 15 23:54:55 CEST 2009
Revision: 41561
http://scummvm.svn.sourceforge.net/scummvm/?rev=41561&view=rev
Author: fingolfin
Date: 2009-06-15 21:54:54 +0000 (Mon, 15 Jun 2009)
Log Message:
-----------
replace some more exit() calls by error() resp. displayHelp()
Modified Paths:
--------------
tools/branches/gsoc2009-gui/compress_agos.cpp
tools/branches/gsoc2009-gui/compress_kyra.cpp
tools/branches/gsoc2009-gui/compress_queen.cpp
tools/branches/gsoc2009-gui/compress_saga.cpp
tools/branches/gsoc2009-gui/compress_scumm_bun.cpp
tools/branches/gsoc2009-gui/compress_scumm_san.cpp
tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
tools/branches/gsoc2009-gui/compress_sword1.cpp
tools/branches/gsoc2009-gui/compress_sword2.cpp
tools/branches/gsoc2009-gui/compress_touche.cpp
tools/branches/gsoc2009-gui/compress_tucker.cpp
tools/branches/gsoc2009-gui/extract_cine.cpp
tools/branches/gsoc2009-gui/extract_t7g_mac.cpp
Modified: tools/branches/gsoc2009-gui/compress_agos.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_agos.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_agos.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -245,8 +245,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
if(strcmp(argv[first_arg], "--mac") == 0) {
Modified: tools/branches/gsoc2009-gui/compress_kyra.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_kyra.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_kyra.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -45,8 +45,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
// Now we try to find the proper output file
Modified: tools/branches/gsoc2009-gui/compress_queen.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_queen.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_queen.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -132,16 +132,14 @@
}
}
- printf("Unknown/unsupported FOTAQ version!\n");
+ error("Unknown/unsupported FOTAQ version");
- exit(1);
return NULL;
}
void checkOpen(FILE *fp, const char *filename) {
if (!fp) {
- printf("Cannot open file: %s\n", filename);
- exit(-1);
+ error("Cannot open file: %s", filename);
}
}
@@ -224,8 +222,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
// Now we try to find the proper output file
Modified: tools/branches/gsoc2009-gui/compress_saga.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_saga.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_saga.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -450,8 +450,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
// Now we try to find the proper output file
Modified: tools/branches/gsoc2009-gui/compress_scumm_bun.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_bun.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_scumm_bun.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -1098,8 +1098,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
uint32 tag;
Modified: tools/branches/gsoc2009-gui/compress_scumm_san.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_san.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_scumm_san.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -649,8 +649,7 @@
notice("Only ogg vorbis and MP3 is supported for this tool.");
if(compMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
uint32 tag;
Modified: tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_sou.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_scumm_sou.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -104,8 +104,7 @@
}
tags = readUint32BE(input);
- if (tags < 8)
- exit(-1);
+ assert(tags >= 8);
tags -= 8;
writeUint32BE(output_idx, (uint32)pos);
@@ -157,8 +156,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
// Now we try to find the proper output file
@@ -179,8 +177,7 @@
g_output_filename = OUTPUT_FLAC;
break;
default:
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
break;
}
}
Modified: tools/branches/gsoc2009-gui/compress_sword1.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword1.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_sword1.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -609,8 +609,7 @@
if(compMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
// Now we try to find the proper output dir
Modified: tools/branches/gsoc2009-gui/compress_sword2.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword2.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_sword2.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -96,8 +96,7 @@
tempEncoded = TEMP_FLAC;
break;
default:
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
break;
}
Modified: tools/branches/gsoc2009-gui/compress_touche.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_touche.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_touche.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -178,8 +178,7 @@
if(gCompMode == kNoAudioMode) {
// Unknown mode (failed to parse arguments), display help and exit
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
}
// Now we try to find the proper output file
@@ -200,8 +199,7 @@
outpath.setFullName(OUTPUT_FLA);
break;
default:
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
break;
}
}
Modified: tools/branches/gsoc2009-gui/compress_tucker.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_tucker.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/compress_tucker.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -561,8 +561,7 @@
outpath.setFullName(OUTPUT_FLA);
break;
default:
- printf(helptext, argv[0]);
- exit(2);
+ displayHelp(helptext, argv[0]);
break;
}
Modified: tools/branches/gsoc2009-gui/extract_cine.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_cine.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/extract_cine.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -234,8 +234,7 @@
void unpackAllResourceFiles(const char *filename, const char *outDir) {
FILE *fp = fopen(filename, "rb");
if (!fp) {
- printf("Unable to open file '%s'\n", filename);
- exit(1);
+ error("Unable to open file '%s'", filename);
}
uint32 unpackedSize, packedSize;
@@ -259,8 +258,7 @@
if (packedSize != unpackedSize) {
CineUnpacker cineUnpacker;
if (!cineUnpacker.unpack(buf, packedSize, buf, unpackedSize)) {
- printf("Error while unpacking 'vol.cnf' data");
- exit(1);
+ error("Failed to unpack 'vol.cnf' data");
}
}
unsigned int resourceFilesCount = READ_BE_UINT16(&buf[0]);
Modified: tools/branches/gsoc2009-gui/extract_t7g_mac.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_t7g_mac.cpp 2009-06-15 21:39:43 UTC (rev 41560)
+++ tools/branches/gsoc2009-gui/extract_t7g_mac.cpp 2009-06-15 21:54:54 UTC (rev 41561)
@@ -7,8 +7,7 @@
char *filenames[NUM_FILES];
if (argc != 2) {
- printf("Usage: %s <file>\n", argv[0]);
- exit(2);
+ displayHelp("Usage: %s <file>\n", argv[0]);
}
if ((ifp = fopen(argv[1], "rb")) == NULL) {
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