[Scummvm-cvs-logs] CVS: tools compress_san.cpp,1.25,1.26 sword1mp3.c,1.3,1.4

[Max Horn]

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

Modified Files:
	compress_san.cpp sword1mp3.c 
Log Message:
Fix warnings

Index: compress_san.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/compress_san.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- compress_san.cpp	8 Dec 2004 22:35:54 -0000	1.25
+++ compress_san.cpp	21 Dec 2004 22:45:30 -0000	1.26
@@ -21,7 +21,6 @@
 
 #include "util.h"
 #include "zlib.h"
-#include <malloc.h>
 
 const char *tag2str(uint32 tag) {
 	static char str[5];
@@ -388,6 +387,8 @@
 		frameAudioSize = 7352;
 	} else if (fps == 10) {
 		frameAudioSize = 8802;
+	} else {
+		error("Unsupported fps value %d", fps);
 	}
 
 	printf("Creating silent wav file...\n");
@@ -582,7 +583,7 @@
 	int track = readUint16LE(input);
 	int index = readUint16LE(input);
 	int nbframes = readUint16LE(input);
-	int data_size = readUint32LE(input);
+	//int data_size = readUint32LE(input);
 	int volume = 127;
 	int trackId = track;
 	int pan = 0;
@@ -614,7 +615,7 @@
 	int trackId = readUint16LE(input);
 	int index = readUint16LE(input);
 	int nbframes = readUint16LE(input);
-	int flags = readUint16LE(input);
+	//int flags = readUint16LE(input);
 	int volume = readByte(input);
 	int pan = readByte(input);
 

Index: sword1mp3.c
===================================================================
RCS file: /cvsroot/scummvm/tools/sword1mp3.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- sword1mp3.c	5 Dec 2004 02:16:04 -0000	1.3
+++ sword1mp3.c	21 Dec 2004 22:45:30 -0000	1.4
@@ -344,13 +344,13 @@
 	exit(2);
 }
 
-int16 *uncompressSpeech(FILE *clu, uint32 index, uint32 cSize, uint32 *returnSize) {
+int16 *uncompressSpeech(FILE *clu, uint32 idx, uint32 cSize, uint32 *returnSize) {
 	uint32 resSize, srcPos;
 	int16 *srcData, *dstData, *dstPos;
 	uint32 headerPos = 0;
 	int16 length, cnt;
 	uint8 *fBuf = (uint8*)malloc(cSize);
-	fseek(clu, index, SEEK_SET);
+	fseek(clu, idx, SEEK_SET);
 	assert(fread(fBuf, 1, cSize, clu) == cSize);
 	while ((READ_BE_UINT32(fBuf + headerPos) != 'data') && (headerPos < 100))
 		headerPos++;