diff options
author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
---|---|---|
committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
commit | 1c90f9fc2eba43be71f9d49dad75c5d0514d4e50 (patch) | |
tree | 63c1116ff43936475874b54d171c7e08556d54ee /src/serialization.cpp | |
parent | 158b054e72582005d895f1ed0e1cb0c9b22a8e57 (diff) | |
parent | 7efe89ff584b2c0338dcede4c1e08504d0158780 (diff) | |
download | minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.gz minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.tar.bz2 minetest-1c90f9fc2eba43be71f9d49dad75c5d0514d4e50.zip |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/serialization.cpp')
-rw-r--r-- | src/serialization.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/serialization.cpp b/src/serialization.cpp index 6a43d9190..ff7ca15f2 100644 --- a/src/serialization.cpp +++ b/src/serialization.cpp @@ -128,7 +128,7 @@ void decompressZlib(std::istream &is, std::ostream &os) ret = inflateInit(&z); if(ret != Z_OK) - throw SerializationError("compressZlib: inflateInit failed"); + throw SerializationError("dcompressZlib: inflateInit failed"); z.avail_in = 0; @@ -162,7 +162,7 @@ void decompressZlib(std::istream &is, std::ostream &os) || status == Z_MEM_ERROR) { zerr(status); - throw SerializationError("compressZlib: inflate failed"); + throw SerializationError("decompressZlib: inflate failed"); } int count = bufsize - z.avail_out; //dstream<<"count="<<count<<std::endl; @@ -182,7 +182,7 @@ void decompressZlib(std::istream &is, std::ostream &os) { dstream<<"unget #"<<i<<" failed"<<std::endl; dstream<<"fail="<<is.fail()<<" bad="<<is.bad()<<std::endl; - throw SerializationError("compressZlib: unget failed"); + throw SerializationError("decompressZlib: unget failed"); } } |