diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-26 12:16:53 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-05-26 12:16:53 +0000 |
| commit | ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b (patch) | |
| tree | d4cc5fb3896996bb805e192efd5fb40ec41a4cfc /src/common/grfio.c | |
| parent | 80ce7898584ef58f01470fc8969bddfca47a2629 (diff) | |
| download | hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.tar.gz hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.tar.bz2 hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.tar.xz hercules-ba9d200a15f3f9ccdc9ba42b5555c6ac9374bf9b.zip | |
Moved the options to disable specific compiler warnings from the generic 'AdditionalOptions' to the appropriate 'DisableSpecificWarnings' section.
Corrected an ancient mistake in the grfio/zlib code (calling inflateEnd in case of an error during the Deflate process).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12726 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common/grfio.c')
| -rw-r--r-- | src/common/grfio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/grfio.c b/src/common/grfio.c index ed2b84e3f..fe94e0803 100644 --- a/src/common/grfio.c +++ b/src/common/grfio.c @@ -270,7 +270,7 @@ int encode_zip(unsigned char* dest, unsigned long* destLen, const unsigned char* err = deflate(&stream, Z_FINISH); if (err != Z_STREAM_END) { - inflateEnd(&stream); + deflateEnd(&stream); return err == Z_OK ? Z_BUF_ERROR : err; } *destLen = stream.total_out; |