diff options
Diffstat (limited to 'src/serialization.cpp')
| -rw-r--r-- | src/serialization.cpp | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/serialization.cpp b/src/serialization.cpp index d30e83726..ac6fc0db2 100644 --- a/src/serialization.cpp +++ b/src/serialization.cpp @@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., /* 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, int level) +void compressZlib(const u8 *data, size_t data_size, std::ostream &os, int level) { z_stream z; const s32 bufsize = 16384; @@ -68,16 +68,16 @@ void compressZlib(SharedBuffer<u8> data, std::ostream &os, int level) 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) @@ -98,8 +98,7 @@ void compressZlib(SharedBuffer<u8> data, std::ostream &os, int level) void compressZlib(const std::string &data, std::ostream &os, int level) { - SharedBuffer<u8> databuf((u8*)data.c_str(), data.size()); - compressZlib(databuf, os, level); + compressZlib((u8*)data.c_str(), data.size(), os, level); } void decompressZlib(std::istream &is, std::ostream &os) @@ -120,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(;;) @@ -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,7 +162,7 @@ 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 @@ -178,7 +177,7 @@ void decompressZlib(std::istream &is, std::ostream &os) throw SerializationError("decompressZlib: unget failed"); } } - + break; } } @@ -186,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]; @@ -242,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(;;) @@ -251,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()) |