[Scummvm-cvs-logs] SF.net SVN: scummvm: [27658] tools/trunk/extract_parallaction.cpp

[fingolfin at users.sourceforge.net]

Revision: 27658
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27658&view=rev
Author:   fingolfin
Date:     2007-06-23 04:49:28 -0700 (Sat, 23 Jun 2007)

Log Message:
-----------
Fix compile error & warnings

Modified Paths:
--------------
    tools/trunk/extract_parallaction.cpp

Modified: tools/trunk/extract_parallaction.cpp
===================================================================
--- tools/trunk/extract_parallaction.cpp	2007-06-23 11:11:27 UTC (rev 27657)
+++ tools/trunk/extract_parallaction.cpp	2007-06-23 11:49:28 UTC (rev 27658)
@@ -55,7 +55,7 @@
 
 int32 Archive::findSubfile(const char* filename) {
 	for (uint32 i = 0; i < _numFiles; i++) {
-		if (!stricmp(filename, _names[i])) return i;
+		if (!scumm_stricmp(filename, _names[i])) return i;
 	}
 
 	return -1;
@@ -133,7 +133,8 @@
 
 	uint32 i;
 	for (i = 0; i < maxEntries; i++) {
-		if (_names[i][0] == '\0') break;
+		if (_names[i][0] == '\0')
+			break;
 	}
 
 	_numFiles = i;
@@ -141,13 +142,15 @@
 	if (_numFiles < maxEntries) {
 		uint32* t = (uint32*)_names[i];
 
-		for (; i < maxEntries + 1; i++) {
-			if (*t != 0) break;
+		for (; i < (uint32)maxEntries + 1; i++) {
+			if (*t != 0)
+				break;
 			t += 8;
 		}
 	} 
 
-	if ( i > maxEntries ) exit(9);
+	if (i > (uint32)maxEntries)
+		exit(9);
 
 	_numSlots = i;
 
@@ -187,7 +190,7 @@
 	*d = '\0';
 
 	for (uint32 i = 0; i < _numFiles; i++) {
-		fprintf(dump, "{ \"%s\",%*s%5i, kArchive%s, %7i },\n", _names[i], 32-strlen(_names[i]), " ", _sizes[i], arcName+1, _offsets[i]);
+		fprintf(dump, "{ \"%s\",%*s%5i, kArchive%s, %7i },\n", _names[i], 32-(int)strlen(_names[i]), " ", _sizes[i], arcName+1, _offsets[i]);
 	}
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.