[Scummvm-cvs-logs] SF.net SVN: scummvm:[35463] scummvm/trunk/engines/m4/compression.cpp

[Kirben at users.sourceforge.net]

Revision: 35463
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35463&view=rev
Author:   Kirben
Date:     2008-12-21 12:21:29 +0000 (Sun, 21 Dec 2008)

Log Message:
-----------
Fix warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/m4/compression.cpp

Modified: scummvm/trunk/engines/m4/compression.cpp
===================================================================
--- scummvm/trunk/engines/m4/compression.cpp	2008-12-21 11:49:58 UTC (rev 35462)
+++ scummvm/trunk/engines/m4/compression.cpp	2008-12-21 12:21:29 UTC (rev 35463)
@@ -98,9 +98,6 @@
 
 //--------------------------------------------------------------------------
 
-const char *FabInputExceededError = "FabDecompressor - Passed end of input buffer during decompression";
-const char *FabOutputExceededError = "FabDecompressor - Decompressed data exceeded specified size";
-
 void FabDecompressor::decompress(const byte *srcData, int srcSize, byte *destData, int destSize) {
 	byte copyLen, copyOfsShift, copyOfsMask, copyLenMask;
 	unsigned long copyOfs;
@@ -151,16 +148,16 @@
 			}
 			while (copyLen-- > 0) {
 				if (destP - destData == destSize)
-					error(FabOutputExceededError);
+					error("FabDecompressor - Decompressed data exceeded specified size");
 
 				*destP = destP[(signed int)copyOfs];
 				destP++;
 			}
 		} else {
 			if (_srcP - srcData == srcSize)
-				error(FabInputExceededError);
+				error("FabDecompressor - Passed end of input buffer during decompression");
 			if (destP - destData == destSize)
-				error(FabOutputExceededError);
+				error("FabDecompressor - Decompressed data exceeded specified size");
 
 			*destP++ = *_srcP++;
 		}
@@ -174,7 +171,7 @@
 	_bitsLeft--;
 	if (_bitsLeft == 0) {
 		if (_srcP - _srcData == _srcSize)
-			error(FabInputExceededError);
+			error("FabDecompressor - Passed end of input buffer during decompression");
 
 		_bitBuffer = (READ_LE_UINT16(_srcP) << 1) | (_bitBuffer & 1);
 		_srcP += 2;


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