From 88be51e8cb18a704152b76b98d49a2bda6fff0a9 Mon Sep 17 00:00:00 2001 From: ai4rei Date: Thu, 7 Jul 2011 09:31:43 +0000 Subject: * Replaced compress/uncompress inline code (encode_zip/decode_zip) with the respective zlib library calls while keeping 3rdparty calls inside common code (follow up to r14888, related r14808). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14891 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/common/grfio.c | 56 ++---------------------------------------------------- 1 file changed, 2 insertions(+), 54 deletions(-) (limited to 'src/common') diff --git a/src/common/grfio.c b/src/common/grfio.c index e31451af1..cb242fe5d 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -225,33 +225,7 @@ unsigned long grfio_crc32 (const unsigned char* buf, unsigned int len) /// Grf data sub : zip decode int decode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen) { - z_stream stream; - int err; - - stream.next_in = (Bytef*)source; - stream.avail_in = (uInt)sourceLen; - // Check for source > 64K on 16-bit machine: - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; - - stream.next_out = (Bytef*) dest; - stream.avail_out = (uInt)*destLen; - if ((unsigned long)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - - err = inflateInit(&stream); - if (err != Z_OK) return err; - - err = inflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - inflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; - - err = inflateEnd(&stream); - return err; + return uncompress(dest, destLen, source, sourceLen); } @@ -259,33 +233,7 @@ int decode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char* /// Grf data sub : zip encode int encode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char* source, unsigned long sourceLen) { - z_stream stream; - int err; - - stream.next_in = (Bytef*)source; - stream.avail_in = (uInt)sourceLen; - // Check for source > 64K on 16-bit machine: - if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; - - stream.next_out = (Bytef*) dest; - stream.avail_out = (uInt)*destLen; - if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; - - stream.zalloc = (alloc_func)0; - stream.zfree = (free_func)0; - - err = deflateInit(&stream,Z_DEFAULT_COMPRESSION); - if (err != Z_OK) return err; - - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out; - - err = deflateEnd(&stream); - return err; + return compress(dest, destLen, source, sourceLen); } -- cgit v1.2.3-60-g2f50