[Scummvm-cvs-logs] SF.net SVN: scummvm: [23344] scummvm/trunk/backends/gp32/gp32std_memory.cpp

[wonst719 at users.sourceforge.net]

Revision: 23344
Author:   wonst719
Date:     2006-06-29 05:31:52 -0700 (Thu, 29 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23344&view=rev

Log Message:
-----------
Whoops. Correct varible name.

Modified Paths:
--------------
    scummvm/trunk/backends/gp32/gp32std_memory.cpp
Modified: scummvm/trunk/backends/gp32/gp32std_memory.cpp
===================================================================
--- scummvm/trunk/backends/gp32/gp32std_memory.cpp	2006-06-29 09:18:27 UTC (rev 23343)
+++ scummvm/trunk/backends/gp32/gp32std_memory.cpp	2006-06-29 12:31:52 UTC (rev 23344)
@@ -56,7 +56,7 @@
 	// Linked list is slow for this task. :)
 	static MemBlock *block;
 
-	byte *block;
+	byte *blockData;
 	size_t size;
 
 //	MemBlock *next;
@@ -68,7 +68,7 @@
 	static void deinit();
 
 	static void *addBlock(size_t size);
-	static void deleteBlock(void *block);
+	static void deleteBlock(void *dstBlock);
 };
 
 byte *MemBlock::userMem = NULL;
@@ -129,7 +129,7 @@
 	byte *ptr = userMem + (i * USER_BLOCK_SIZE);
 
 	blk->size = size;
-	blk->block = ptr;
+	blk->blockData = ptr;
 	blk->used = 1;
 
 	prevBlock = i;
@@ -137,17 +137,17 @@
 	return (void *) ptr;
 }
 
-void MemBlock::deleteBlock(void *block)
+void MemBlock::deleteBlock(void *dstBlock)
 {
-	uint32 np = (uint32) block - (uint32) userMem;
+	uint32 np = (uint32) dstBlock - (uint32) userMem;
 
 	if ((np / USER_BLOCK_SIZE) * USER_BLOCK_SIZE != np) {
-		gm_free(block);
+		gm_free(dstBlock);
 //		warning("wrong block! (%d / %d)", (np / USER_BLOCK_SIZE) * USER_BLOCK_SIZE, np);
 	}
 	int i = np / USER_BLOCK_SIZE;
 	if (i > NUM_BLOCK) {
-		gm_free(block);
+		gm_free(dstBlock);
 		return;
 	}
 	block[i].used = 0;
@@ -155,11 +155,11 @@
 /*
 	int i = 0;
 	for (i = 0; i < NUM_BLOCK; i++) {
-		if (block[i].block == block)
+		if (block[i].blockData == dstBlock)
 			break;
 	}
 	if (i == NUM_BLOCK) {
-		gm_free(block);	//fixme?
+		gm_free(dstBlock);	//fixme?
 		//warning("wrong block! %x", (uint32)block - (uint32)userMem);
 	} else {
 		GPDEBUG("deleteing block %d", i);


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