[Scummvm-cvs-logs] SF.net SVN: scummvm: [30166] tools/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Wed Jan 2 22:05:37 CET 2008


Revision: 30166
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30166&view=rev
Author:   fingolfin
Date:     2008-01-02 13:05:36 -0800 (Wed, 02 Jan 2008)

Log Message:
-----------
cleanup

Modified Paths:
--------------
    tools/trunk/extract_mm_nes.c
    tools/trunk/extract_zak_c64.c
    tools/trunk/kyra_pak.cpp
    tools/trunk/util.h

Modified: tools/trunk/extract_mm_nes.c
===================================================================
--- tools/trunk/extract_mm_nes.c	2008-01-02 20:31:36 UTC (rev 30165)
+++ tools/trunk/extract_mm_nes.c	2008-01-02 21:05:36 UTC (rev 30166)
@@ -25,7 +25,7 @@
 
 /* if defined, generates a set of .LFL files */
 /* if not defined, dumps all resources to separate files */
-#define	MAKE_LFLS
+#define MAKE_LFLS
 
 #ifdef MAKE_LFLS
 void writeByteAlt(FILE *fp, uint8 b) {
@@ -1058,8 +1058,8 @@
 }
 #endif	/* MAKE_LFLS */
 
-uint32	CRCtable[256];
-void	InitCRC(void) {
+static uint32	CRCtable[256];
+static void InitCRC(void) {
 	const uint32 poly = 0xEDB88320;
 	int i, j;
 	uint32 n;
@@ -1070,7 +1070,7 @@
 		CRCtable[i] = n;
 	}
 }
-uint32	CheckROM(FILE *file) {
+static uint32 CheckROM(FILE *file) {
 	uint32 CRC = 0xFFFFFFFF;
 	uint32 i;
 
@@ -1080,7 +1080,7 @@
 	return CRC ^ 0xFFFFFFFF;
 }
 
-int main (int argc, char **argv) {
+int main(int argc, char **argv) {
 	FILE *input, *output;
 	char fname[256];
 	int i, j;
@@ -1133,10 +1133,11 @@
 		error("Maniac Mansion (Japan) is not supported");
 		break;
 	default:
-		error("ROM contents not recognized (%08X)",CRC);
+		error("ROM contents not recognized (%08X)", CRC);
 		break;
 	}
-#ifdef	MAKE_LFLS
+
+#ifdef MAKE_LFLS
 	memset(&lfl_index, 0, sizeof(lfl_index));
 
 	for (i = 0; lfls[i].num != -1; i++) {

Modified: tools/trunk/extract_zak_c64.c
===================================================================
--- tools/trunk/extract_zak_c64.c	2008-01-02 20:31:36 UTC (rev 30165)
+++ tools/trunk/extract_zak_c64.c	2008-01-02 21:05:36 UTC (rev 30166)
@@ -26,14 +26,15 @@
 void writeByteAlt(FILE *fp, uint8 b) {
 	writeByte(fp, (uint8)(b ^ 0xFF));
 }
+
 void writeUint16LEAlt(FILE *fp, uint16 value) {
 	writeUint16LE(fp, (uint16)(value ^ 0xFFFF));
 }
+
 #define writeByte writeByteAlt
 #define writeUint16LE writeUint16LEAlt
 
-#define NUM_ROOMS	59
-
+#define NUM_ROOMS 59
 unsigned char room_disks[NUM_ROOMS], room_tracks[NUM_ROOMS], room_sectors[NUM_ROOMS];
 
 static const int SectorOffset[36] = {

Modified: tools/trunk/kyra_pak.cpp
===================================================================
--- tools/trunk/kyra_pak.cpp	2008-01-02 20:31:36 UTC (rev 30165)
+++ tools/trunk/kyra_pak.cpp	2008-01-02 21:05:36 UTC (rev 30166)
@@ -39,21 +39,21 @@
 	// TODO: get rid of temp. buffer
 	uint8 *buffer = new uint8[filesize];
 	assert(buffer);
-	
+
 	fread(buffer, filesize, 1, pakfile);
-	
+
 	fclose(pakfile);
-	
+
 	const char *currentName = 0;
-	
+
 	uint32 startoffset = _isAmiga ? READ_BE_UINT32(buffer) : READ_LE_UINT32(buffer);
 	uint32 endoffset = 0;
 	uint8* position = buffer + 4;
-	
+
 	while (true) {
 		uint32 strlgt = strlen((const char*)position);
 		currentName = (const char*)position;
-		
+
 		if (!(*currentName))
 			break;
 
@@ -65,19 +65,19 @@
 			endoffset = filesize;
 		}
 		position += 4;
-		
+
 		uint8 *data = new uint8[endoffset - startoffset];
 		assert(data);
 		memcpy(data, buffer + startoffset, endoffset - startoffset);
 		addFile(currentName, data, endoffset - startoffset);
 		data = 0;
-		
+
 		if (endoffset == filesize)
 			break;
-		
+
 		startoffset = endoffset;
 	}
-	
+
 	delete [] buffer;
 	return true;
 }
@@ -91,11 +91,11 @@
 		error("couldn't open file '%s' for writing", file);
 		return false;
 	}
-	
+
 	// TODO: implement error handling
 	uint32 startAddr = _fileList->getTableSize()+5+4;
 	static const char *zeroName = "\0\0\0\0\0";
-	
+
 	uint32 curAddr = startAddr;
 	for (FileList *cur = _fileList; cur; cur = cur->next) {
 		if (_isAmiga)
@@ -110,11 +110,11 @@
 	else
 		writeUint32LE(f, curAddr);
 	fwrite(zeroName, 1, 5, f);
-	
+
 	for (FileList *cur = _fileList; cur; cur = cur->next)
 		fwrite(cur->data, 1, cur->size, f);
-	
-	fclose(f);	
+
+	fclose(f);
 	return true;
 }
 
@@ -176,7 +176,7 @@
 
 	if (!cur)
 		return 0;
-	
+
 	if (size)
 		*size = cur->size;
 	return cur->data;
@@ -187,13 +187,13 @@
 		error("entry '%s' already exists");
 		return false;
 	}
-	
+
 	FILE *f = fopen(file, "rb");
 	if (!f) {
 		error("couldn't open file '%s'", file);
 		return false;
 	}
-	
+
 	uint32 filesize = fileSize(f);
 	uint8 *data = new uint8[filesize];
 	assert(data);
@@ -201,7 +201,7 @@
 		error("couldn't read from file '%s'", file);
 		return false;
 	}
-	fclose(f);	
+	fclose(f);
 	return addFile(name, data, filesize);
 }
 

Modified: tools/trunk/util.h
===================================================================
--- tools/trunk/util.h	2008-01-02 20:31:36 UTC (rev 30165)
+++ tools/trunk/util.h	2008-01-02 21:05:36 UTC (rev 30166)
@@ -76,7 +76,7 @@
 	#define snprintf _snprintf
 
 	#define SCUMM_LITTLE_ENDIAN
-	
+
 #elif defined(__MINGW32__)
 
 	#define scumm_stricmp stricmp


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