From 61085e279ed451aa588a091764bdcb589061c5f0 Mon Sep 17 00:00:00 2001
From: Travis Howell
Date: Sun, 21 Dec 2008 12:21:29 +0000
Subject: Fix warnings.

svn-id: r35463
---
 engines/m4/compression.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'engines/m4/compression.cpp')

diff --git a/engines/m4/compression.cpp b/engines/m4/compression.cpp
index 53c801e0b7..7dbb11f685 100644
--- a/engines/m4/compression.cpp
+++ b/engines/m4/compression.cpp
@@ -98,9 +98,6 @@ MadsPack::~MadsPack() {
 
 //--------------------------------------------------------------------------
 
-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 @@ void FabDecompressor::decompress(const byte *srcData, int srcSize, byte *destDat
 			}
 			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 @@ int FabDecompressor::getBit() {
 	_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;
-- 
cgit v1.2.3