[Scummvm-cvs-logs] SF.net SVN: scummvm: [30965] tools/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Mon Feb 25 15:43:15 CET 2008
Revision: 30965
http://scummvm.svn.sourceforge.net/scummvm/?rev=30965&view=rev
Author: fingolfin
Date: 2008-02-25 06:43:15 -0800 (Mon, 25 Feb 2008)
Log Message:
-----------
Fixed some warnings
Modified Paths:
--------------
tools/trunk/compress_queen.cpp
tools/trunk/compress_saga.cpp
tools/trunk/extract_agos.cpp
Modified: tools/trunk/compress_queen.cpp
===================================================================
--- tools/trunk/compress_queen.cpp 2008-02-25 14:37:16 UTC (rev 30964)
+++ tools/trunk/compress_queen.cpp 2008-02-25 14:43:15 UTC (rev 30965)
@@ -73,18 +73,22 @@
uint32 dataFileSize;
};
-struct {
+struct Entry {
char filename[13];
uint8 bundle;
uint32 offset;
uint32 size;
-} entry;
+};
-struct {
+Entry entry;
+
+struct VersionExtra {
uint8 compression;
uint16 entries;
-} versionExtra;
+};
+VersionExtra versionExtra;
+
struct PatchFile {
const char *filename;
char lang;
Modified: tools/trunk/compress_saga.cpp
===================================================================
--- tools/trunk/compress_saga.cpp 2008-02-25 14:37:16 UTC (rev 30964)
+++ tools/trunk/compress_saga.cpp 2008-02-25 14:43:15 UTC (rev 30965)
@@ -149,7 +149,7 @@
bool detectFile(const char *inFileName) {
int gamesCount = ARRAYSIZE(gameDescriptions);
- int i, j, k;
+ int i, j;
uint8 md5sum[16];
char md5str[32+1];
char currentFile[256];
@@ -178,7 +178,7 @@
// same encoding
getFilename(inFileName, currentFile);
- for (k = 0; k < strlen(currentFile); k++)
+ for (unsigned int k = 0; k < strlen(currentFile); k++)
currentFile[k] = tolower(currentFile[k]);
if (strcmp(gameDescriptions[i].filesDescriptions[j].fileName, currentFile) == 0) {
Modified: tools/trunk/extract_agos.cpp
===================================================================
--- tools/trunk/extract_agos.cpp 2008-02-25 14:37:16 UTC (rev 30964)
+++ tools/trunk/extract_agos.cpp 2008-02-25 14:43:15 UTC (rev 30965)
@@ -102,7 +102,7 @@
if (type == SD_TYPE_LITERAL) {
SD_GETBITS(x, x); y += x;
- if ((y + 1) > (d - dest)) {
+ if ((int)(y + 1) > (d - dest)) {
return 0; /* overflow? */
}
@@ -111,7 +111,7 @@
*--d = x;
} while (y-- > 0);
} else {
- if ((y + 1) > (d - dest)) {
+ if ((int)(y + 1) > (d - dest)) {
return 0; /* overflow? */
}
@@ -167,7 +167,7 @@
* - returns zero if failed, or non-zero if successful
*/
int savefile(char *name, void *mem, size_t length) {
- int bytesWritten;
+ unsigned int bytesWritten;
FILE *fd = fopen(name, "wb");
if (fd == 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