[Scummvm-cvs-logs] SF.net SVN: scummvm:[49974] scummvm/trunk/engines/sci/resource.cpp

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Fri Jun 18 01:52:17 CEST 2010


Revision: 49974
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49974&view=rev
Author:   thebluegr
Date:     2010-06-17 23:52:17 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Renamed error -> errorNum to avoid name clashes with error()

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-06-17 23:50:28 UTC (rev 49973)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-06-17 23:52:17 UTC (rev 49974)
@@ -1603,14 +1603,14 @@
 }
 
 int Resource::decompress(ResVersion volVersion, Common::SeekableReadStream *file) {
-	int error;
+	int errorNum;
 	uint32 szPacked = 0;
 	ResourceCompression compression = kCompUnknown;
 
 	// fill resource info
-	error = readResourceInfo(volVersion, file, szPacked, compression);
-	if (error)
-		return error;
+	errorNum = readResourceInfo(volVersion, file, szPacked, compression);
+	if (errorNum)
+		return errorNum;
 
 	// getting a decompressor
 	Decompressor *dec = NULL;
@@ -1642,12 +1642,12 @@
 
 	data = new byte[size];
 	_status = kResStatusAllocated;
-	error = data ? dec->unpack(file, data, szPacked, size) : SCI_ERROR_RESOURCE_TOO_BIG;
-	if (error)
+	errorNum = data ? dec->unpack(file, data, szPacked, size) : SCI_ERROR_RESOURCE_TOO_BIG;
+	if (errorNum)
 		unalloc();
 
 	delete dec;
-	return error;
+	return errorNum;
 }
 
 ResourceCompression ResourceManager::getViewCompression() {


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