diff options
| author | Travis Howell | 2008-12-21 12:21:29 +0000 |
|---|---|---|
| committer | Travis Howell | 2008-12-21 12:21:29 +0000 |
| commit | 61085e279ed451aa588a091764bdcb589061c5f0 (patch) | |
| tree | 609ef74f3b06abfeadb816d270c508a094bda456 /engines/m4/compression.cpp | |
| parent | f510b28a495d6e82e8e75b86f039f02ca1894d6e (diff) | |
| download | scummvm-rg350-61085e279ed451aa588a091764bdcb589061c5f0.tar.gz scummvm-rg350-61085e279ed451aa588a091764bdcb589061c5f0.tar.bz2 scummvm-rg350-61085e279ed451aa588a091764bdcb589061c5f0.zip | |
Fix warnings.
svn-id: r35463
Diffstat (limited to 'engines/m4/compression.cpp')
| -rw-r--r-- | engines/m4/compression.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
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; |