Optimize headers (part 2) (#6272)

[minetest.git] / src / serialization.cpp

diff --git a/src/serialization.cpp b/src/serialization.cpp
index e79342432dc2168806599fe63fdd44357053d970..ac6fc0db2c7da542e2c4875f32eae2862ad6dfac 100644 (file)
--- a/src/serialization.cpp
+++ b/src/serialization.cpp
@@ -1,6 +1,6 @@
 /*
 Minetest
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -20,14 +20,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "serialization.h"
 
 #include "util/serialize.h"
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(WIN32_NO_ZLIB_WINAPI)
        #define ZLIB_WINAPI
 #endif
 #include "zlib.h"
 
 /* report a zlib or i/o error */
 void zerr(int ret)
-{   
+{
     dstream<<"zerr: ";
     switch (ret) {
     case Z_ERRNO:
@@ -53,7 +53,7 @@ void zerr(int ret)
     }
 }
 
-void compressZlib(SharedBuffer<u8> data, std::ostream &os)
+void compressZlib(const u8 *data, size_t data_size, std::ostream &os, int level)
 {
        z_stream z;
        const s32 bufsize = 16384;
@@ -65,19 +65,19 @@ void compressZlib(SharedBuffer<u8> data, std::ostream &os)
        z.zfree = Z_NULL;
        z.opaque = Z_NULL;
 
-       ret = deflateInit(&z, -1);
+       ret = deflateInit(&z, level);
        if(ret != Z_OK)
                throw SerializationError("compressZlib: deflateInit failed");
-       
+
        // Point zlib to our input buffer
        z.next_in = (Bytef*)&data[0];
-       z.avail_in = data.getSize();
+       z.avail_in = data_size;
        // And get all output
        for(;;)
        {
                z.next_out = (Bytef*)output_buffer;
                z.avail_out = bufsize;
-               
+
                status = deflate(&z, Z_FINISH);
                if(status == Z_NEED_DICT || status == Z_DATA_ERROR
                                || status == Z_MEM_ERROR)
@@ -94,13 +94,11 @@ void compressZlib(SharedBuffer<u8> data, std::ostream &os)
        }
 
        deflateEnd(&z);
-
 }
 
-void compressZlib(const std::string &data, std::ostream &os)
+void compressZlib(const std::string &data, std::ostream &os, int level)
 {
-       SharedBuffer<u8> databuf((u8*)data.c_str(), data.size());
-       compressZlib(databuf, os);
+       compressZlib((u8*)data.c_str(), data.size(), os, level);
 }
 
 void decompressZlib(std::istream &is, std::ostream &os)
@@ -121,9 +119,9 @@ void decompressZlib(std::istream &is, std::ostream &os)
        ret = inflateInit(&z);
        if(ret != Z_OK)
                throw SerializationError("dcompressZlib: inflateInit failed");
-       
+
        z.avail_in = 0;
-       
+
        //dstream<<"initial fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
 
        for(;;)
@@ -134,7 +132,8 @@ void decompressZlib(std::istream &is, std::ostream &os)
                if(z.avail_in == 0)
                {
                        z.next_in = (Bytef*)input_buffer;
-                       input_buffer_len = is.readsome(input_buffer, bufsize);
+                       is.read(input_buffer, bufsize);
+                       input_buffer_len = is.gcount();
                        z.avail_in = input_buffer_len;
                        //dstream<<"read fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
                }
@@ -143,7 +142,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
                        //dstream<<"z.avail_in == 0"<<std::endl;
                        break;
                }
-                       
+
                //dstream<<"1 z.avail_in="<<z.avail_in<<std::endl;
                status = inflate(&z, Z_NO_FLUSH);
                //dstream<<"2 z.avail_in="<<z.avail_in<<std::endl;
@@ -163,10 +162,11 @@ void decompressZlib(std::istream &is, std::ostream &os)
                if(status == Z_STREAM_END)
                {
                        //dstream<<"Z_STREAM_END"<<std::endl;
-                       
+
                        //dstream<<"z.avail_in="<<z.avail_in<<std::endl;
                        //dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl;
                        // Unget all the data that inflate didn't take
+                       is.clear(); // Just in case EOF is set
                        for(u32 i=0; i < z.avail_in; i++)
                        {
                                is.unget();
@@ -177,7 +177,7 @@ void decompressZlib(std::istream &is, std::ostream &os)
                                        throw SerializationError("decompressZlib: unget failed");
                                }
                        }
-                       
+
                        break;
                }
        }
@@ -185,23 +185,23 @@ void decompressZlib(std::istream &is, std::ostream &os)
        inflateEnd(&z);
 }
 
-void compress(SharedBuffer<u8> data, std::ostream &os, u8 version)
+void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version)
 {
        if(version >= 11)
        {
-               compressZlib(data, os);
+               compressZlib(*data ,data.getSize(), os);
                return;
        }
 
        if(data.getSize() == 0)
                return;
-       
+
        // Write length (u32)
 
        u8 tmp[4];
        writeU32(tmp, data.getSize());
        os.write((char*)tmp, 4);
-       
+
        // We will be writing 8-bit pairs of more_count and byte
        u8 more_count = 0;
        u8 current_byte = data[0];
@@ -241,7 +241,7 @@ void decompress(std::istream &is, std::ostream &os, u8 version)
        u8 tmp[4];
        is.read((char*)tmp, 4);
        u32 len = readU32(tmp);
-       
+
        // We will be reading 8-bit pairs of more_count and byte
        u32 count = 0;
        for(;;)
@@ -250,7 +250,7 @@ void decompress(std::istream &is, std::ostream &os, u8 version)
                u8 byte=0;
 
                is.read((char*)&more_count, 1);
-               
+
                is.read((char*)&byte, 1);
 
                if(is.eof())