[Scummvm-cvs-logs] CVS: tools compress_queen.c,1.7,1.8

Max Horn fingolfin at users.sourceforge.net
Sun Jan 22 07:30:02 CET 2006


Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1760

Modified Files:
	compress_queen.c 
Log Message:
Fix GCC warning

Index: compress_queen.c
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_queen.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- compress_queen.c	18 Jan 2006 16:36:56 -0000	1.7
+++ compress_queen.c	22 Jan 2006 15:29:28 -0000	1.8
@@ -215,9 +215,10 @@
 	int size, i = 1;
 	uint32 prevOffset;
 
-	if (argc < 2 || (0 == strcmp(argv[argc - 1], "--mp3") && 0 == strcmp(argv[argc - 1], "--vorbis") && 0 == strcmp(argv[argc - 1], "--flac") != 0))
-		showhelp(argv[0]);
 	
+	if (argc < 2)
+		showhelp(argv[0]);
+
 	if (strcmp(argv[1], "--mp3") == 0) {
 		compressionType = COMPRESSION_MP3;
 		tempEncoded = TEMP_MP3;
@@ -228,9 +229,7 @@
 			ptr += sprintf(ptr, "%s ", argv[i]);
 		}
 		ptr += sprintf(ptr, "%s %s", TEMP_SB, tempEncoded);
-	}
-
-	if (strcmp(argv[1], "--vorbis") == 0) {
+	} else if (strcmp(argv[1], "--vorbis") == 0) {
 		compressionType = COMPRESSION_OGG;
 		tempEncoded = TEMP_OGG;
 		i++;
@@ -239,9 +238,7 @@
 			/* Append optional encoder arguments */
 			ptr += sprintf(ptr, "%s ", argv[i]);
 		}
-	}
-
-	if (strcmp(argv[1], "--flac") == 0) {
+	} else if (strcmp(argv[1], "--flac") == 0) {
 		compressionType = COMPRESSION_FLAC;
 		tempEncoded = TEMP_FLAC;
 		i++;
@@ -253,6 +250,8 @@
 		}
 
 		ptr += sprintf(ptr, "-o %s %s", tempEncoded, TEMP_SB );
+	} else {
+		showhelp(argv[0]);
 	}
 
 	/* Open input file (QUEEN.1) */





More information about the Scummvm-git-logs mailing list