[Scummvm-cvs-logs] SF.net SVN: scummvm: [30273] tools/branches/branch-0-11-0

[thebluegr at users.sourceforge.net]

Revision: 30273
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30273&view=rev
Author:   thebluegr
Date:     2008-01-05 15:27:07 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Cleanup/whitespace fix (sync with trunk)

Modified Paths:
--------------
    tools/branches/branch-0-11-0/extract_zak_c64.c
    tools/branches/branch-0-11-0/kyra_pak.cpp

Modified: tools/branches/branch-0-11-0/extract_zak_c64.c
===================================================================
--- tools/branches/branch-0-11-0/extract_zak_c64.c	2008-01-05 23:20:12 UTC (rev 30272)
+++ tools/branches/branch-0-11-0/extract_zak_c64.c	2008-01-05 23:27:07 UTC (rev 30273)
@@ -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/branches/branch-0-11-0/kyra_pak.cpp
===================================================================
--- tools/branches/branch-0-11-0/kyra_pak.cpp	2008-01-05 23:20:12 UTC (rev 30272)
+++ tools/branches/branch-0-11-0/kyra_pak.cpp	2008-01-05 23:27:07 UTC (rev 30273)
@@ -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);
 }
 


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